add aliases
Merge branch 'master' of github.com:chazy/settings

Conflicts:
	aliases