work so far
Merge branch 'master' of https://github.com/richardcurteis/BattleshipsTest