UGH
Merge branch 'master' of https://github.com/thely/wtsscheduling

Conflicts:
	wp-content/themes/alexandria-child/student_signup.php
Merge branch 'master' of https://github.com/thely/wtsscheduling

Conflicts:
	wp-content/themes/alexandria-child/student_signup.php