School Info
Merge branch 'master' of https://github.com/HHSCode/HHSAPP

Conflicts:
	HHSApp/HHSApp.xcodeproj/project.pbxproj