Added time thingy
Merge https://github.com/JohnMai/WhiteSharks
Placement of dialogue in office scenes
Merge https://github.com/JohnMai/WhiteSharks
Merge pull request #279 from JohnMai/anthonylim

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

Placement of dialogue in office scenes