Les truc sont rendu vraiment trop magique toute bug pu pentoute gg
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/ZombieMale.prefab
	Project/Assets/Scripts/PowerUp.cs
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/metadata/4f/4fd4616b08dbb52449f1a6b93b73bcd6
	Project/Library/metadata/7f/7f316b7db58890e4cb0e392134001c03
	Project/Library/metadata/9c/9c3e61ff95811724b8e3c846eaade57c
	Project/Library/metadata/a6/a66588329bd417947b2657f07fd26192
	Project/Library/metadata/a7/a72e6aa7bd9984c4b8dd91a2b4728b89
	Project/Project-csharp.sln
	Project/Project.sln