blub
Merge branch 'master' of https://github.com/asekulic/we-lab3-group55.git

Conflicts:
	.cache
	.target/controllers/Application.class