ignore git files
colorscheme and nerdtree layout
merge in master