Merge pull request #35 from ScrambledEgge101/master

Fix
5-15-2014 1608

added idle
Merge pull request #37 from DevenSmith/master

shh just accept my merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
dkjslkf
5-15-2014 1745

added music
Merge remote-tracking branch 'upstream/master'
Merge pull request #38 from DevenSmith/master

stevens
steven stuff
Merge branch 'master' of https://github.com/wintergolem/TrickyNinja

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
more art changes?
Merge branch 'master' of https://github.com/wintergolem/TrickyNinja

Conflicts:
	TrickyNinja/TrickyNinja.userprefs