wer
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014
Menu pas mal avancé 1
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/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/4f/4fd4616b08dbb52449f1a6b93b73bcd6
	Project/Library/metadata/97/97b5e4ea33958bb48a333139330bfa38
	Project/Library/metadata/9c/9c3e61ff95811724b8e3c846eaade57c
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Temp/UnityTempFile-20ebdf340f3621642a7d9c26dd96a26a
	Project/Temp/UnityTempFile-5907e74c79220b547ae882c38103d2c8
	Project/Temp/UnityTempFile-81ee656d5933e3b4786831605710fbbc
	Project/Temp/UnityTempFile-8840adb4970e3f14fac042ccccf1d280