another really bad message
merge conflicts resolved
Merge branch 'master' of github.com:tnwo/battleships
no idea