Merge https://github.com/mrpez/FoodWeb
add_hours
made a pointless file
Beginning Framework for Menu Editor
Merge https://github.com/jordanspecht/foodweb
Merge https://github.com/mdichman/foodweb

Conflicts:
	webRoot/class/Controller/VendorController.php
Commented Out Display Hours Functions

There are there, but they do not work, still looking at them.