setup.sh commit
Merge branch 'master' of github.com:daviduc/setup