Merge pull request #5 from csce431-e/master

update
Merge pull request #26 from jesheffield/master

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

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

fixed ship placement bug and added screen between turns for battleship
Merge pull request #1 from csce431-e/master

pull
Changing server code
Merge pull request #28 from tvkwoodlands/master

pushing server
Merge pull request #4 from csce431-e/master

Update