Merge pull request #16 from JohnMai/master

Update
Merge pull request #17 from JohnMai/master

Art Update
Merge pull request #18 from JohnMai/master

Update Again
journal script cleanup
journal script cleanup
Merge pull request #19 from JohnMai/master

Fix
Merge pull request #20 from JohnMai/master

Fix 2.0
scene name change prep
Merge branch 'master' of https://github.com/paranoidmarv/WhiteSharks
journal script cleanup
scene name change prep
Merge https://github.com/JohnMai/WhiteSharks
Merge https://github.com/JohnMai/WhiteSharks
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
map fixed

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

map fix
Merge pull request #21 from JohnMai/master

Adrian Update
Added Speed Per Room

Scenes now have a configurable base speed value that is given to the
player.
Merge branch 'master' of https://github.com/Kiroshima/WhiteSharks_SantiFork