add aliases
Merge branch 'master' of https://github.com/mupat/dev

Conflicts:
	gitconfig