Update stuff
Merge branch 'master' of https://github.com/marmaluke/botLeague

Conflicts:
	db.sqlite3
	robots/views.pyc