Merge pull request #3 from tailorck/master

5:10PM
Merge pull request #4 from tailorck/master

6:45PM
ameyer
Merge pull request #5 from ameyer92/master

ameyer
7:20PM
7;25
Merge branch 'master' of https://github.com/hcastor/Battleship
7:35PM game.cpp change
Merge pull request #6 from ameyer92/master

CHeck out mah changes.