a
Merge remote-tracking branch 'origin/master'

Conflicts:
	game/__init__.py
some changes for quiz class
some changes for quiz class