JohnMai/WhiteSharks — pull request #333 by shaitanelnifi (2014-05-26 03:56:47+00:00)
Title: some changes that need merging

i guess