Merge https://github.com/JohnMai/WhiteSharks
Merge https://github.com/JohnMai/WhiteSharks
Some other chap 4 tweaks

here it is
Maps and shit
stuff

yeah
Merge pull request #333 from shaitanelnifi/master

some changes that need merging
May walks and more fixes
Merge pull request #334 from mentatzoe/master

May walks and more fixes
Scale Mismatch Chapter 2 and Chapter 3

Except the Market Obviously
set up market place

set up market place
Merge branch 'master' of https://github.com/JohnMai/WhiteSharks
Merge pull request #335 from Kiroshima/master

Scale Mismatch Chapter 2 and Chapter 3