more member variables passing test
Merge branch 'master' of github.com:beriukay/battleship
merge