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
More Chapter 2 fixes

mostly positioning and such
Merge pull request #357 from shaitanelnifi/master

More Chapter 2 fixes
layer problem

layer problem
Merge branch 'master' of https://github.com/JohnMai/WhiteSharks
Merge https://github.com/JohnMai/WhiteSharks