prpr
commit :)
Merge branch 'master' of https://github.com/teamzz/RASUS.LectureProject

Conflicts:
	RASUSLab/src/main/java/hr/fer/ztel/domain/QuizHolder.java
	RASUSLab/src/main/webapp/WEB-INF/views/entry.jsp
	RASUSLab/src/main/webapp/resources/css/foundation.css
Merge branch 'master' of https://github.com/teamzz/RASUS.LectureProject