diff --git a/vim/.vim/bundle/nerdtree b/vim/.vim/bundle/nerdtree
new file mode 160000
index 0000000..0b44415
--- /dev/null
+++ b/vim/.vim/bundle/nerdtree
@@ -0,0 +1 @@
+Subproject commit 0b44415a3302030b56755cc1135ca9ca57dc1ada
diff --git a/vim/.vim/bundle/nerdtree-git-plugin b/vim/.vim/bundle/nerdtree-git-plugin
new file mode 160000
index 0000000..932552e
--- /dev/null
+++ b/vim/.vim/bundle/nerdtree-git-plugin
@@ -0,0 +1 @@
+Subproject commit 932552ee295971cfb202c3b360319cb56e4ba6f0
diff --git a/vim/.vimrc b/vim/.vimrc
index 5b1662d..4af9e40 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -20,6 +20,8 @@ call vundle#begin()
 Plugin 'gmarik/Vundle.vim'
 Plugin 'bling/vim-airline'
 Plugin 'whatyouhide/vim-gotham'
+Plugin 'scrooloose/nerdtree'
+Plugin 'Xuyuanp/nerdtree-git-plugin'
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
 filetype plugin indent on    " required
@@ -42,3 +44,22 @@ let g:airline_powerline_fonts = 1
 let g:airline#extensions#tabline#enabled = 1
 
 set hidden
+
+let g:NERDTreeIndicatorMapCustom = {
+    \ "Modified"  : "✹",
+    \ "Staged"    : "✚",
+    \ "Untracked" : "✭",
+    \ "Renamed"   : "➜",
+    \ "Unmerged"  : "═",
+    \ "Deleted"   : "✖",
+    \ "Dirty"     : "✗",
+    \ "Clean"     : "✔︎",
+    \ "Unknown"   : "?"
+    \ }
+
+autocmd vimenter * NERDTree
+autocmd StdinReadPre * let s:std_in=1
+autocmd VimEnter * if argc() == 0 && !exists("s:std_in") | NERDTree | endif
+autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTreeType") && b:NERDTreeType == "primary") | q | endif
+map <C-n> :NERDTreeToggle<CR>
+let NERDTreeShowHidden=1