Layout-gepruts
Merge branch 'master' of https://github.com/A-StadLabs/schipbreuk

Conflicts:
	app/elements/our-game/our-game.html
	app/elements/our-scenes/our-scenes.css
	app/elements/our-scenes/our-scenes.html