SOFIJhiwa
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014

Conflicts:
	Project/Assets/Graphics/Animation/Zombie1-Mort.png.meta
	Project/Assets/Graphics/Animation/Zombie2-mort.png.meta
	Project/Library/CurrentMaximizeLayout.dwlt
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Temp/UnityTempFile-122c3990123a6b040ab0368c5c279f99
	Project/Temp/UnityTempFile-2aadccff108bb3343b7b3f08d8a8c4f2
	Project/Temp/UnityTempFile-4612050b5cfac5a4c862222121030513
	Project/Temp/UnityTempFile-5184523d0fb818a4eb38c3db6efceb19
	Project/Temp/UnityTempFile-564bf762205da52498037bbad236f181
	Project/Temp/UnityTempFile-6473b84cfdfbc8c4eaf11d607f84e992
	Project/Temp/UnityTempFile-bf042c7a17aaccf49b67f0af801e671d
	Project/Temp/UnityTempFile-d94773fc02b54df43a76e7be566fb578
	Project/Temp/UnityTempFile-fa6728a1f2ba2da47b5840a08d069de0
Mort des zombies