canvas upload now working
Merge branch 'master' of https://github.com/namespacestd/devfest_mmaa

Conflicts:
	game/views.py
Merge branch 'master' of https://github.com/namespacestd/devfest_mmaa