Reordered some things
Merge branch 'master' of https://github.com/Yoeori/BattleFrogsJS