fix
Merge branch 'master' of github.com:shin-en/dotfiles

Conflicts:
	.gitignore