Change-Id: Ib5c332d345b6c7d49da9b39c125bcececfba10f8
Signed-off-by: Nicolas <studium@nmarin.de>
Merge branch 'master' of https://github.com/nicma/WE_II_Minigolf.git

Conflicts:
	Minigolf/start.php