helpful commit message
Merge branch 'master' of https://github.com/Brandon-Schur/Appointment_Scheduler

Conflicts:
	php/getListOfEventTypes.php