Merge branch 'master' of https://github.com/zahramahmood/McNairAlumni

Conflicts:
	alumniSearch.php
Merge branch 'master' of https://github.com/zahramahmood/McNairAlumni

Conflicts:
	alumniSearch.php