Added DB Stuff
Merge branch 'master' of https://github.com/ryan-gyger/Team12MobileApp