Merge pull request #14 from csce431-e/master

update
Merge pull request #66 from jcrabb13/master

server code
Game is playable with GUI, allows player to place pieces and allows for win condition
Merge pull request #15 from csce431-e/master

updating my files
Merge branch 'master' of https://github.com/mstombaugh/trevons-games-1.git
Merge pull request #67 from mstombaugh/master

Battleship is working, quit button added, currently cannot open multiple battleships from the same client
Merge pull request #68 from jcrabb13/master

more server stuffs
Game is playable with GUI, allows player to place pieces and allows for win condition
Merge pull request #16 from csce431-e/master

updating my files
Merge branch 'master' of https://github.com/mstombaugh/trevons-games-1.git
Merge pull request #69 from mstombaugh/master

Release for Battleship v 1.0
Game is playable with GUI, allows player to place pieces and allows for win condition
Merge pull request #70 from mstombaugh/master

The real BattleShip v1.0
Merge pull request #8 from csce431-e/master

updating