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
sdafd