quiz
Merge branch 'master' of https://github.com/IsaacVH/gamify-sr

Conflicts:
	circle_test.html