Merge pull request #317 from shaitanelnifi/master

Made progress on chap 4
fixed some of ch2 xml

kept/renamed old files in case I screwed everything up due to being
tired
Merge pull request #320 from jcotrel/master

fixed some of ch2 xml
chapter 2 path finding glitches

chapter 2 path finding glitches