Change back your schoolmanager.java
changes to schoolmanager
Merge branch 'master' of https://github.com/hongyongwhy/nypicode2015

Conflicts:
	src/data/SchoolsManager.java
Merge branch 'master' of https://github.com/hongyongwhy/nypicode2015

Conflicts:
	src/data/SchoolsManager.java
Merge branch 'master' of https://github.com/hongyongwhy/nypicode2015

Conflicts:
	src/data/RegistrationManager.java
	src/main/webapp/styl.css
Merge branch 'master' of https://github.com/hongyongwhy/nypicode2015