Merge pull request #1 from kaitlin-farr/master

pulling pegSolitaire
Merge pull request #2 from kaitlin-farr/master

grabbing files
Merge pull request #4 from kaitlin-farr/master

updating my files
Merge pull request #6 from kaitlin-farr/master

updating my files
Added ability to place ships, attack spaces, and win the game.
Merge pull request #7 from kaitlin-farr/master

updating my code
Added ability to place ships, attack spaces, and win the game.
Added ability to place ships, attack spaces, and win the game.
Added ability to place ships, attack spaces, and win the game.
Merge pull request #16 from mstombaugh/master

Added a simplified GUI that has 2 game boards
Merge pull request #3 from kaitlin-farr/master

updating