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

Conflicts:
	.target/controllers/Application.class
	app/controllers/Application.java
Merge branch 'master' of https://github.com/asekulic/we-lab3-group55.git
Merge branch 'master' of https://github.com/asekulic/we-lab3-group55.git

Conflicts:
	.target/controllers/Application.class
Spielfluss in der QUiz Seite