QQ
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/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/guidmapper
	Project/Library/metadata/65/658abec2b47b172438ec44f3c34f0911
	Project/Library/metadata/9c/9c3e61ff95811724b8e3c846eaade57c
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Temp/UnityTempFile-1a83794701c492a40b468fff143c0e5b
	Project/Temp/UnityTempFile-222932cbe0cc06c4999e7f0bb82240d1
	Project/Temp/UnityTempFile-3a836228aab548141a142b9d16e28396
	Project/Temp/UnityTempFile-9314f3dcc9bdb8540af8dbbe64e59d76