Merge pull request #543 from jcotrel/master

updated market note
layers and walls

layers and walls
Merge branch 'master' of https://github.com/JohnMai/WhiteSharks
Merge pull request #544 from jcotrel/master

Cleaning up some files
jane's scale in cafe scene

jane's scale in cafe scene
Merge branch 'master' of https://github.com/JohnMai/WhiteSharks
Final Brain Room Art
Merge pull request #546 from Kiroshima/master

Final Brain Room Art
fixed #405