update scene
Merge branch 'master' of https://github.com/lukaselmer/ethz-game-lab

Conflicts:
	Assets/Scenes/Scene.unity