updated aliases for volume
Merge branch 'master' of https://github.com/jplace/setup-computer

Conflicts:
	resources/bash_aliases
added volume controls