Chapter4 Intro XML Loads Properly
Merge https://github.com/JohnMai/WhiteSharks
Manual Merge
Scene Tweaks

Chapter 3
Manual Merges
Merge pull request #347 from Kiroshima/master

Chapter 3 Fixes
Map almost completely functional
Merge pull request #348 from mentatzoe/master

Map almost completely functional