More bugs fixed!
Merge branch 'master' of https://github.com/kylearchie/BrainXone

Conflicts:
	BrainXone/src/backend/CheckAnswerServlet.java