spec2
Merge branch 'master' of https://github.com/RhysStansfield/makers_battleship
merge spec1