Signed-off-by: S120561 <S120561@OP990-8R6635J.b45x.dtu.dk>
Merge branch 'master' of https://github.com/emilhein/16_CDIOFinal.git

Conflicts:
	16_CDIOFinal/WebContent/log.jsp

Signed-off-by: S120561 <S120561@OP990-8R6635J.b45x.dtu.dk>