reopen assignment klar... haha...
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/WebContent/WEB-INF/jsp/assignment/self_correction.jsp