Merge branch 'develop'
added parse
Merge branch 'master' of https://github.com/yaleims/webapp into develop

Conflicts:
	yaleIMs/app/index.html
	yaleIMs/app/scripts/controllers/leaderboard.js
	yaleIMs/app/scripts/services/parseservice.js
	yaleIMs/app/views/leaderboard.html
Shields for all the colleges