clean up Database.php
fix setup.sh
Merge branch 'master' of github.com:cadejscroggins/hp-hackathon