Fix prompting commit msg only after git diff is not empty
Merge branch 'master' of github.com:Maxlufs/dotfiles

Conflicts:
	bootstrap.sh