Fixed intro

Transitions should be at least not glitchy. Inexistent, but not glitchy
either.
Merge branch 'alim4' of https://github.com/JohnMai/WhiteSharks into alim4
Merge pull request #99 from Kiroshima/master

Yay
Added apostrophes to chapter1 XML

Yea boi
Merge pull request #100 from JohnMai/alim4

Alim4
WalkNoise null check
Merge pull request #101 from JohnMai/alim4

WalkNoise null check
created new Journal prefab

rebasing to test in chapter 1
created new Journal prefab

rebasing to test in chapter 1
journal working now

-removed old UI roots
-put journal on ignore raycast layer
-got rid buttons and panels that were no longer in use
-journal pops up when jane walks out onto balcony. ask me if you want me
to change that
-had to edit scenes, should be fun
Merge branch 'master' of https://github.com/paranoidmarv/WhiteSharks

Conflicts:
	Assets/GuI Prefab/UI Root.prefab
	Assets/Scripts/journal.cs
Merge pull request #102 from paranoidmarv/master

The journal works again
fixed merge conflicts
Merge pull request #103 from paranoidmarv/master

fixed merge conflicts
fixed bugs A* bug, glitch of character after clicking outside the screen

fixed bugs A* bug, glitch of character after clicking outside the screen