changes to header file
battleship header merged