Final one, hopefully! :D
Merge branch 'Web' of https://github.com/milosjovac/elfakHakaton into Web

Conflicts:
	Web/database/database.js
	Web/models/class.js
	Web/routes.js