Add 'git aa' and 'git m'
Merge branch 'master' of github.com:csuhta/environment