Small changes to powerups
PowerUps close to finished
...
Merge branch 'GregWork'

Conflicts:
	Project4_Fighter/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project4_Fighter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project4_Fighter/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Project4_Fighter/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Project4_Fighter/Library/assetDatabase3
	Project4_Fighter/Library/guidmapper
	Project4_Fighter/Library/metadata/1f/1fe33cb07c016394497341e04ef392f3
	Project4_Fighter/Library/metadata/2f/2f7b8eb92e761ec47b3a844dfc41ddd8
	Project4_Fighter/Library/metadata/30/3049dffabc5225d40b27675901977fdd
	Project4_Fighter/Library/metadata/32/32c517b4574714d489dc70380540124c
	Project4_Fighter/Library/metadata/86/86e8ee28ceb696748b94f34f9e37a1d7
	Project4_Fighter/Library/metadata/95/9559e3528c549174fb8b252fc86a991e
	Project4_Fighter/Temp/UnityTempFile-12a7468dbf72bc84e8846d30ca2e46a8
	Project4_Fighter/Temp/UnityTempFile-1a3e8cc4bc664f249b60faac5ec663d5
	Project4_Fighter/Temp/UnityTempFile-1f261439a7507374ab141a71a8565051
	Project4_Fighter/Temp/UnityTempFile-3246c6130707d4945b5f89579143ef4c
	Project4_Fighter/Temp/UnityTempFile-64af9940387bad24bae0c8e1543a9c47
	Project4_Fighter/Temp/UnityTempFile-9ee4021a99d4381419989dde97409178
	Project4_Fighter/Temp/__EditModeScene