works
Merge branch 'master' of github.com:GoyGoy/team-pomodoro

Conflicts:
	web/teampomodoro/teams/models.py
	web/teampomodoro/templates/index.html