First commit
Merge branch 'master' of github.com:mnazim/vim

Conflicts:
	.gitignore