journal script cleanup
journal script cleanup
scene name change prep
Merge branch 'master' of https://github.com/paranoidmarv/WhiteSharks
journal script cleanup
scene name change prep
renamed scenes fix
Merge branch 'master' of https://github.com/paranoidmarv/WhiteSharks

Conflicts:
	Assets/Scenes/Levels.ini
	Assets/Scripts/CharacterSelect.cs
	Assets/Scripts/journal.cs
new office

new office
map fixed

-bad code is bad
Merge pull request #64 from paranoidmarv/master

map fix
Merge pull request #21 from JohnMai/master

Adrian Update