--
00

00
Merge pull request #542 from Kiroshima/master

Circle Resets
slight door fix and sprite changes

yeah
Merge https://github.com/JohnMai/WhiteSharks
updated market note
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
Cleaning up some files
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
Merge pull request #546 from Kiroshima/master

Final Brain Room Art
Merge https://github.com/JohnMai/WhiteSharks
fixed #405
Merge pull request #547 from jcotrel/master

fixed #405
character reposition

yeah
Merge pull request #548 from shaitanelnifi/master

repositioned characters with new center
brainroom walls and path

brainroom walls and path