1
Merge branch 'master' of https://github.com/mfukusim/dotfiles

Conflicts:
	.vimrc
Merge branch 'master' of https://github.com/mfukusim/dotfiles