Merge branch 'develop'
Merge branch 'master' of https://github.com/jpyoung/BattleShip682