Merge branch 'master' of github.com:s894330/NailVim

Conflicts:
	README.md
Merge branch 'master' of github.com:s894330/NailVim

Conflicts:
	README.md