5-14-2014 1608

fixed the monk staff spin and adjusted power up drop rate
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
Merge pull request #32 from DevenSmith/master

5-14-2014 1614 I dont request a pull I demand it