update scene 2
Merge branch 'master' of https://github.com/josbalcaen/BrainsEden

Conflicts:
	brainseden_game/game_files/Assets/Scenes/scene2.unity