Getting ready to finish the admin panel
Merge branch 'master' of https://github.com/hannep/PennApps

Conflicts:
	app/game/Game.py
	app/game/__init__.py