Bships

Merging battleships branch so far to allow others to pull, will immediately create a new branch to carry on working on it