asd
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014
Réglage rejouer
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014

Conflicts:
	Project/Assets/Prefabs/Elephant.prefab
	Project/Assets/Prefabs/MountainTile.prefab
	Project/Assets/Prefabs/MudTile.prefab
	Project/Assets/Prefabs/Phantom.prefab
	Project/Assets/Prefabs/Poisson.prefab
	Project/Assets/Prefabs/PowerUpAttack.prefab
	Project/Assets/Prefabs/PowerUpHeal.prefab
	Project/Assets/Prefabs/PowerUpSpeed.prefab
	Project/Assets/Prefabs/SpikeTile.prefab
	Project/Assets/Prefabs/ZombieFemale.prefab
	Project/Assets/Prefabs/ZombieMale.prefab
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/guidmapper
	Project/Library/metadata/a7/a72e6aa7bd9984c4b8dd91a2b4728b89
	Project/Library/metadata/f5/f540a57bfaafb384aaf29f01f82b20e5
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Project.userprefs
	Project/Temp/UnityTempFile-0cf8666546ff2324c9f40bc2e4185867
	Project/Temp/UnityTempFile-1ee112cebe1cadb4f9c7104e6f204b53
Mouvement des ennemis fluide
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014

Conflicts:
	Project/Library/CurrentLayout.dwlt
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/expandedItems
	Project/Library/metadata/c3/c336e9618437bf646af621874b6f8347
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Project.userprefs
	Project/Temp/__EditModeScene
Blabla