Fix
Merge branch 'master' of https://github.com/chin4ski/a.vim

Conflicts:
	plugin/a.vim