Added time thingy
Merge https://github.com/JohnMai/WhiteSharks
Fixed compile warnings

Modified lots of stuff
Fixed compile warnings

Modified lots of stuff
Placement of dialogue in office scenes
Merge branch 'anthonylim' of https://github.com/JohnMai/WhiteSharks into anthonylim

Conflicts:
	Assets/Scripts/gameStart.cs
Merge https://github.com/JohnMai/WhiteSharks
Merge pull request #278 from JohnMai/anthonylim

Fixed compile warnings
Added sound controls

will allow the implementation of an options menu
Fix merge conflict
Merge pull request #279 from JohnMai/anthonylim

Fix merge conflict
Merge pull request #280 from mentatzoe/master

Placement of dialogue in office scenes
Merge pull request #281 from shaitanelnifi/master

Added sound controls
spawning location for some scenes

spawning location for some scenes
Merge branch 'master' of https://github.com/JohnMai/WhiteSharks
Set Ch2 Sizing