collision problem, scene effect

collision problem, scene effect
Merge branch 'master' of https://github.com/JohnMai/WhiteSharks
updated enums
updated enums
Merge pull request #236 from jcotrel/master

updated enums
Merge pull request #237 from JohnMai/anthonylim

Changed font to Exo 2