merge
Merge branch 'master' of https://github.com/moyashiki/dotfiles

Conflicts:
	.vimrc