Merge pull request #7 from csce431-e/master

updating my files
Merge pull request #8 from csce431-e/master

updating my files
Game is playable with GUI, allows player to place pieces and allows for win condition
Merge pull request #39 from mstombaugh/master

Added BattleShip tests and changed a few methods in Ship.java