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

Conflicts:
	Project/Assets/Graphics/Bouette.png.meta
	Project/Assets/Graphics/Normal.png.meta
	Project/Assets/Graphics/RockyMountain.png.meta
	Project/Assets/Graphics/Spikes.png.meta
	Project/Library/CurrentLayout.dwlt
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/guidmapper
	Project/Library/metadata/a7/a72e6aa7bd9984c4b8dd91a2b4728b89
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Temp/UnityTempFile-5043f3f7dac291e4a80236221287824c
	Project/Temp/UnityTempFile-616bfdf9cdf3f8d4f83f4f71c8a9e009