Fixed db access
Merge branch 'database'
 Merging
Merge branch 'master' of https://github.com/andrewbruni/finalproject

Updating