Not sure at all what was done this session.
Merge branch 'master' of https://github.com/ChelseaSchool/Chelsea_Mobile

Conflicts:
	admissions.php
	alum.php
	index.php