huge bug

huge bug
Merge branch 'master' of https://github.com/JohnMai/WhiteSharks
Small changes in dialogue positioning
Merge pull request #343 from JohnMai/anthonylim

Small changes in dialogue positioning