Idek at this point
Merge branch 'master' of https://github.com/iz2140/ProjectArtemis
Merge branch 'master' of https://github.com/iz2140/ProjectArtemis

Conflicts:
	artemis/WebContent/results.jsp
Merge branch 'master' of https://github.com/iz2140/ProjectArtemis