Rien
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
kkk
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014
Animations Walk
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014

Conflicts:
	Project/Assets/Graphics/Animation.meta
	Project/Assets/Graphics/Animation/Elephant-1.png.meta
	Project/Assets/Graphics/Animation/Elephant-2.png.meta
	Project/Assets/Graphics/Animation/Elephant-3.png.meta
	Project/Assets/Graphics/Animation/Poisson-1.png.meta
	Project/Assets/Graphics/Animation/Poisson-2.png.meta
	Project/Assets/Graphics/Animation/Poisson-3.png.meta
	Project/Assets/Graphics/Animation/Zombie1-1.png.meta
	Project/Assets/Graphics/Animation/Zombie1-2.png.meta
	Project/Assets/Graphics/Animation/Zombie1-3.png.meta
	Project/Assets/Graphics/Animation/Zombie2-1.png.meta
	Project/Assets/Graphics/Animation/Zombie2-2.png.meta
	Project/Assets/Graphics/Animation/Zombie2-3.png.meta
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/guidmapper
	Project/Project-csharp.sln
	Project/Project.sln
Animations encore
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014

Conflicts:
	Project/Library/CurrentLayout.dwlt