5-8-2014 1430

implemented powerups and jasons sound stuff for player
Merge pull request #27 from DevenSmith/master

5-8-2014 1430
merge to master
Merge remote-tracking branch 'origin/Branch'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
Merge remote-tracking branch 'origin/master' into Branch

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
sdf
EndofDay