List all 7 teams
Merge branch 'master' of github.com:rahulsom/100ddcal

Conflicts:
	src/main/webapp/js/app.js