modified db-api to actually use the db
Merge branch 'master' of github.com:cohen990/angelhack-2014