changed database to point to my database
Merge branch 'master' of github.com:PennockProjects/Prog270-Pennock