huge bug

huge bug
Merge branch 'master' of https://github.com/JohnMai/WhiteSharks