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 #2 from csce431-e/master

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

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

updating my files