Zombies et génération et ennemis
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014

Conflicts:
	Project/Assets/Graphics/Elephant.png.meta
	Project/Assets/Graphics/PowerUpAttack.png.meta
	Project/Assets/Graphics/PowerUpHeal.png.meta
	Project/Assets/Graphics/PowerUpSpeed.png.meta
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/guidmapper
	Project/Library/metadata/34/34bf49c9f0feaac41bc00a72427fab71
	Project/Library/metadata/9c/9c3e61ff95811724b8e3c846eaade57c
	Project/Library/metadata/ca/ca9f74f31e4e67b4381643a11c6ee675