add vimrc
Merge branch 'hotfix/issue2'

Conflicts:
	README.md