Completed ZombieController.cs
kjjj
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014

Conflicts:
	Project/Assets/Scripts/Personnage.cs
	Project/Library/CurrentLayout.dwlt
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/metadata/65/658abec2b47b172438ec44f3c34f0911
	Project/Library/metadata/7f/7f316b7db58890e4cb0e392134001c03
	Project/Library/metadata/97/97b5e4ea33958bb48a333139330bfa38
	Project/Library/metadata/9c/9c3e61ff95811724b8e3c846eaade57c
	Project/Library/metadata/a7/a72e6aa7bd9984c4b8dd91a2b4728b89
	Project/Library/metadata/aa/aa770468be21f7545a95bb63fc13139c
	Project/Library/metadata/ed/ed8e8fed3c31fa943b86c88df0daaa41
	Project/Project-csharp.sln
	Project/Project.sln