added test values for tables'
Merge branch 'master' of https://github.com/jdcohen9/happy-hour into connor_joe_controller_setup
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
Merge pull request #3 from jdcohen9/connor_joe_controller_setup

Connor joe controller setup
siyan-and-beverly