un"fix"ed my phone bug "fix"
Merge pull request #176 from jcotrel/master

un"fix"ed my phone bug "fix"
Merge branch 'anthonylim' of https://github.com/JohnMai/WhiteSharks into anthonylim