Merge branch 'master' of github.com:johnfoley3/CS430 into slave

Conflicts:
	app/php/get/get_meeting_attendance.php
started on listing attendance on inserting meetings
Merge branch 'slave' of github.com:johnfoley3/CS430 into slave

Conflicts:
	app/php/get/get_meeting_attendance.php