Update u1
Merge branch 'Web' of https://github.com/milosjovac/elfakHakaton into Web

Conflicts:
	Web/routes/index.js