Still changing vendor controller
Merge https://github.com/mrpez/FoodWeb
Jordan Finished userSettings

Not tested on Xammp cuz it don't work good
Merge https://github.com/jordanspecht/FoodWeb
Merge https://github.com/mrpez/FoodWeb
add_hours
made a pointless file
Finished Edit Hours, Trying to Display Them
Beginning Framework for Menu Editor
Merge https://github.com/jordanspecht/foodweb
Merge https://github.com/mdichman/foodweb

Conflicts:
	webRoot/class/Controller/VendorController.php
Menu Editor Category Tree
Tray merging