tmp
Merge branch 'master' of https://github.com/s-shin/dotfiles

Conflicts:
	.bash_profile
Merge branch 'master' of https://github.com/s-shin/dotfiles

Conflicts:
	.bash_profile