aliases
Merge branch 'master' of github.com:uri247/utools

Conflicts:
	aliases