merge
merge
Merge branch 'master' of https://github.com/hspinks/cs108

Conflicts:
	build/classes/admin/AnnouncementServlet.class
	build/classes/admin/Announcements.class
	build/classes/admin/QuizServlet.class
	build/classes/admin/UserServlet.class
	build/classes/messages/AcceptServlet.class
	build/classes/messages/Challenge.class
	build/classes/messages/FriendRequest.class
	build/classes/messages/Messages.class
	build/classes/messages/RejectServlet.class
	build/classes/models/Question.class
	build/classes/models/QuestionCreationServlet.class
	build/classes/models/QuestionResponseQuestion.class
	build/classes/models/Quiz.class
	build/classes/models/QuizResult.class
	build/classes/models/QuizSite.class
	build/classes/userPackage/Achievement.class
	build/classes/userPackage/Friend.class
merge
merge
merge
merge