diff --git a/my_configs.vim.orig b/my_configs.vim.orig
new file mode 100644
index 00000000..495a3659
--- /dev/null
+++ b/my_configs.vim.orig
@@ -0,0 +1,35 @@
+<<<<<<< 3667b54b19b952b13d638536b5f47e226d252e30
+" Basic formatting settings
+set listchars=tab:»·,trail:·
+set list
+" Turn on line numbering
+set number
+syntax on
+colorscheme monokai
+
+" Enable folding
+set foldmethod=indent
+set foldlevel=99
+
+" Adds proper PEP-8 settings for Python files
+au BufNewFile,BufRead *.py
+    \ set tabstop=4
+    \ set softtabstop=4
+    \ set shiftwidth=4
+    \ set textwidth=79
+    \ set expandtab
+    \ set autoindent
+    \ set fileformat=unix
+
+au BufNewFile,BufRead *.js, *.html, *.css
+    \ set tabstop=2
+    \ set softtabstop=2
+    \ set shiftwidth=2
+||||||| merged common ancestors
+=======
+set listchars=tab:»·,trail:·
+set list
+set number
+syntax on
+colorscheme monokai
+>>>>>>> -added personal git configuration file
diff --git a/sources_non_forked/LaTeX-Box b/sources_non_forked/LaTeX-Box
new file mode 160000
index 00000000..3c2901e1
--- /dev/null
+++ b/sources_non_forked/LaTeX-Box
@@ -0,0 +1 @@
+Subproject commit 3c2901e12cb78bfb2be58ba4c62a488612550fe1
diff --git a/sources_non_forked/vim-rails b/sources_non_forked/vim-rails
new file mode 160000
index 00000000..fc5d7792
--- /dev/null
+++ b/sources_non_forked/vim-rails
@@ -0,0 +1 @@
+Subproject commit fc5d7792afbebc7bef8de1e3a00713bba2932a24