merge from git hub
Merge branch 'master' of https://github.com/AtsushiSakai/myvim

Conflicts:
	.vimrc
merge
for pull
Merge branch 'master' of https://github.com/AtsushiSakai/myvim
add color scheme set up function for .srv file