indent
Merge branch 'master' of github.com:soramugi/dotfiles

Conflicts:
	.vimrc