changing initialize
 fixed Merge conflict
Merge pull request #8 from babelberry/battleships

Battleships