Merge pull request #537 from mentatzoe/master

Cafe Backgrounds Added
Merge pull request #538 from mentatzoe/master

Atlas updated (missing cutscene characters)
Reset Circle Positions on NPC's
Merge pull request #539 from mentatzoe/master

Atlas redux
Merge https://github.com/JohnMai/WhiteSharks
--
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
Final Brain Room Art
Merge pull request #546 from Kiroshima/master

Final Brain Room Art