More DB stuff
Merge branch 'master' of https://github.com/tylerhargett/GUIDB-Cupcake