ADD powerup image
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014

Conflicts:
	Project/Assets/Graphics/Elephant.png.meta
	Project/Assets/Graphics/PowerUpAttack.png.meta
	Project/Assets/Graphics/PowerUpHeal.png.meta
	Project/Assets/Graphics/PowerUpSpeed.png.meta
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/guidmapper