d
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014
Ajout du tutoriel
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014

Conflicts:
	Project/Assembly-CSharp-vs.csproj
	Project/Assembly-CSharp.csproj
	Project/Assets/Audio.meta
	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/CurrentLayout.dwlt
	Project/Library/InspectorExpandedItems.asset
	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/19/19d7b85e29aa3764294d58071d636da7
	Project/Library/metadata/7f/7f316b7db58890e4cb0e392134001c03
	Project/Library/metadata/9c/9c3e61ff95811724b8e3c846eaade57c
	Project/Library/metadata/ac/ac326110550b58c4da703a3ba6f56818
	Project/Library/metadata/c5/c59afe6af452b714e9ced8aaffcca2b1
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Temp/UnityTempFile-2f9d7ddfb67685d42841d5963ea2cef8
	Project/Temp/__EditModeScene