aliasの設定ほか
Merge branch 'master' of github.com:tmsanrinsha/dotfiles

Conflicts:
	.vimrc