Merge pull request #1 from jdcohen9/connor_joe_controller_setup

new blank database file
Merge pull request #2 from jdcohen9/connor_joe_controller_setup

Connor joe controller setup
added test values for tables'
Merge branch 'master' of https://github.com/jdcohen9/happy-hour into connor_joe_controller_setup
WIP: working on queries
Merge branch 'siyan-and-beverly' of https://github.com/jdcohen9/happy-hour into connor_joe_controller_setup
merged with siyan and beverly branch: controller changes added