nove promjene bez promjena
ppp
Merge branch 'master' of https://github.com/teamzz/RASUS.LectureProject

Conflicts:
	RASUSLab/src/main/webapp/WEB-INF/views/SolveSimpleQuiz.jsp
no chnages
no change
Merge branch 'master' into tomek

Conflicts:
	RASUSLab/src/main/webapp/WEB-INF/views/SolveSimpleQuiz.jsp
promjena bez promjene #3
SimpleSolver Tom Dams
Merge branch 'master' of https://github.com/teamzz/RASUS.LectureProject
Merge branch 'master' into tomek

Conflicts:
	RASUSLab/TODO.txt