merge
Merge branch 'master' of https://github.com/patel66/HMMC

Conflicts:
	web/app/views/schools/signup.html.erb
Merge branch 'master' of https://github.com/patel66/HMMC

Conflicts:
	web/app/assets/images/100MMClogomockup.png
Merge branch 'master' of https://github.com/patel66/HMMC

Conflicts:
	web/app/views/schools/index.html.erb
updated homepage