Better ship checking
Merge branch 'master' of https://github.com/maxanier/battleships.git