commit
Merge branch 'master' of https://github.com/ftfniqpl/ftfniqpl-vim

Conflicts:
	README.md