really tired of commit statements
Merge branch 'master' of https://github.com/hspinks/cs108

Conflicts:
	build/classes/models/QuizSite.class