Merge pull request #29 from DevenSmith/master

5-9-2014 1053
MonkOnNavmesh
Merge branch 'master' of https://github.com/wintergolem/TrickyNinja

Conflicts:
	TrickyNinja/TrickyNinja.userprefs
"Truth" art added: Cave and lantern
Merge branch 'master' of https://github.com/wintergolem/TrickyNinja
broken art
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs