hello
Merge branch 'master' of https://github.com/panchenjin/dotvim
Merge branch 'master' of https://github.com/panchenjin/dotvim
afasl
Merge branch 'master' of https://github.com/panchenjin/dotvim

Conflicts:
	.vimrc
Merge branch 'master' of https://github.com/panchenjin/dotvim

Conflicts:
	.vimrc