Added new alias: gmg as git merge  --no-ff
Merge branch 'master' of github.com:FGrosse/dotfiles

Conflicts:
	git/alias.conf