V3
Merge branch 'master' of https://github.com/game-time/OpenPy

Conflicts:
	functions.py
	views.py