merge
Merge branch 'master' of ssh://github.com/amybear/quiz

Conflicts:
	build/classes/quiz/Quiz.class