tentative de sauvetage
Merge branch 'master' of https://github.com/Arihy/GGJ2014

Conflicts:
	GGJ14/Assets/Prefabs/fondBleu.prefab
	GGJ14/Assets/Prefabs/fondRouge.prefab
	GGJ14/Assets/Scenes/SceneMell.unity
	GGJ14/Assets/Scenes/SceneSteph2.unity
	GGJ14/Assets/Scenes/level1.unity
	GGJ14/Assets/Scriptes/PlayerController2Bis.cs.meta
	GGJ14/Assets/Scriptes/PlayerControllerBis.cs.meta