Full circle success
Merge branch 'master' of https://github.com/ericapisani/EventFoodPlanner

Conflicts:
	eventfoodplanner/eventTitles
	eventfoodplanner/eventfoodplanner/templates/supervisormenu.html
	eventfoodplanner/workfile