Pushing trolley
Merge branch 'develop' of https://github.com/NotPeax/Mozilla_Jam_Gems into develop

Conflicts:
	Assets/Prefabs/_Game_Manager_.prefab
	Assets/Scenes/Main.unity
Commit des 2 manettes
Merge branch 'develop' of https://github.com/NotPeax/Mozilla_Jam_Gems into develop

Conflicts:
	Assets/Prefabs/Map.prefab
	Assets/Prefabs/Player.prefab
	Assets/Prefabs/Rock_1.prefab
	Assets/Prefabs/Rock_2.prefab
	Assets/Prefabs/_Game_Manager_.prefab
	Assets/Scenes/Main.unity
	Assets/Scripts/Game_Manager.cs