answer

answer
answer

answer
Merge branch 'master' of https://github.com/r61ethinkpad/answer

Conflicts:
	answer/model/recordModel.php
	answer/view/default/admin/game/error.html
	answer/view/default/admin/game/next.html
	answer/view/default/admin/game/over.html
	answer/view/default/admin/game/question.html