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

Conflicts:
	Project/Assets/Audio.meta
	Project/Assets/Prefabs/Elephant.prefab
	Project/Assets/Prefabs/GroundTile.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/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/guidmapper
	Project/Library/metadata/19/19d7b85e29aa3764294d58071d636da7
	Project/Library/metadata/9c/9c3e61ff95811724b8e3c846eaade57c
	Project/Library/metadata/a7/a72e6aa7bd9984c4b8dd91a2b4728b89
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Temp/UnityTempFile-99cd53d2920b1df4997037996ef0a42d
	Project/Temp/UnityTempFile-e5aaa0c785a63fa4ca737a4536a79c09
	Project/Temp/UnityTempFile-fa68c33bd5cfe0e4197d3fa61a5e8048
	Project/Temp/__EditModeScene