s
Merge branch 'master' of https://github.com/Mikroplu/Projekt.git

Conflicts:
	src/main/webapp/index.jsp
	src/main/webapp/scripts.js
d
e