commit!
commit!
Merge branch 'master' of https://github.com/miya-masa/dotfiles

Conflicts:
	dotFilesLink.sh