All working but final test
Merging with Darrell's changes
Merge branch 'master' of https://github.com/hamchapman/Battleships
Tidied up and refactored some code in board.rb