fixed getHtml method for FillInTheBlankQuestion
Merge branch 'master' of https://github.com/hspinks/cs108
Merge branch 'master' of https://github.com/hspinks/cs108
merge
Merge branch 'master' of https://github.com/hspinks/cs108

Conflicts:
	build/classes/admin/UserServlet.class
Merge branch 'master' of https://github.com/hspinks/cs108
merge & minor bug fixes
Merge branch 'master' of https://github.com/hspinks/cs108