finit le grand magicien
as
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014

Conflicts:
	Project/Assets/Prefabs/Elephant.prefab
	Project/Assets/Prefabs/GroundTile.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/expandedItems
	Project/Library/guidmapper
	Project/Library/metadata/00/00720435c5085a541975a8f952ddbbd7
	Project/Library/metadata/0d/0d9d907f226bfb8498f2b5af2787e656
	Project/Library/metadata/1b/1b3f228cc1da3d84cb0d694b1e236578
	Project/Library/metadata/40/40504806ef102f24390627a05a52596e
	Project/Library/metadata/4a/4ae027c20dc06be47b9d473b5a2123f5
	Project/Library/metadata/59/59f0708ecb5c1154a9af81608d651536
	Project/Library/metadata/5a/5a64eaee1b22f1d4fabcdfd3d5a38df9
	Project/Library/metadata/69/69d0bb8436c83b441b02bd26d672a882
	Project/Library/metadata/73/73e6337f75b7997459aac2ddd74bec3b
	Project/Library/metadata/77/7790d18cc84492e4d9a56933e86d2f5c
	Project/Library/metadata/77/77bf1c8e1e862f749a9509787c1c1db5
	Project/Library/metadata/7f/7f316b7db58890e4cb0e392134001c03
	Project/Library/metadata/8e/8e7386599d3d0a34e8a362303892ed86
	Project/Library/metadata/90/90392d8b67997354190ef27f068e0fbc
	Project/Library/metadata/90/909817872e6ec6c4ea6a86d513a4b459
	Project/Library/metadata/ae/aea7bb0b151245347a66201ec6fc6d4e
	Project/Library/metadata/bc/bcb6f60a0f8003a449055a8cb2724357
	Project/Library/metadata/c0/c0694e1ab48a39741a700e1e2cb599cc
	Project/Library/metadata/c4/c493641afef11604ba74c527f412976d
	Project/Library/metadata/ca/ca4b1a2751f09e049832558f3b842181
	Project/Library/metadata/dc/dca8b1ec79cbdbb48be7312fb3f895b5
	Project/Library/metadata/e2/e2a8d6bc1580bd847b8b95fd54ca8884
	Project/Library/metadata/e5/e5b542c60ac42364587585f7071136ad
	Project/Library/metadata/eb/eb343769ef27b6f41a5231364f835701
	Project/Project-csharp.sln
	Project/Project.sln