vimrc
Merge branch 'master' of https://github.com/ktakuminnnjp1983/1303

Conflicts:
	memo.txt