fuck off pyc
Merge branch 'iter2frontend' of github.com:lprader/SportsCohorts into iter2frontend

Conflicts:
	db.sqlite3
	users/models.pyc
added a google map
Fixe merge I hope
added google maps api