added score and udpated tests for ship with player object
Merge branch 'development' of github.com:babelberry/Battleships into development