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

Conflicts:
	Project/Assets/Prefabs/Elephant.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/CurrentLayout.dwlt
	Project/Library/CurrentMaximizeLayout.dwlt
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/expandedItems
	Project/Library/guidmapper
	Project/Library/metadata/65/658abec2b47b172438ec44f3c34f0911
	Project/Library/metadata/7f/7f316b7db58890e4cb0e392134001c03
	Project/Library/metadata/a7/a72e6aa7bd9984c4b8dd91a2b4728b89
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Temp/UnityTempFile-122c3990123a6b040ab0368c5c279f99
	Project/Temp/UnityTempFile-239319cd6c15aeb458a277d787c961d6
	Project/Temp/UnityTempFile-24752c018223c9a40a112ceedeccb568
	Project/Temp/UnityTempFile-32b69880d14939a4c8265f398cb94de4
	Project/Temp/__EditModeScene