fixed choose teams
Merge branch 'master' of https://github.com/dbroglie/cs1520aggregator

Conflicts:
	server.py