changed how it asks the database
Merge branch 'master' of github.com:edlongman/whileaway