Added local and global gitignore (global one has been created via gitignore.io
Added vimrc
Fixed merge conflict when adding NERDTree