add 'git branch -a'
Merge branch 'master' of github.com:davejagoda/Proggy
fix git auto-merge of gitr.sh