Merge pull request #39 from mstombaugh/master

Added BattleShip tests and changed a few methods in Ship.java
Merge pull request #3 from csce431-e/master

pulling
all the mancalas
all the mancalas
all the mancalas
all the mancalas
Merge pull request #40 from kaitlin-farr/master

adding all the mancalas
Merge pull request #4 from csce431-e/master

pulling
Test code for solitaire
Merge pull request #41 from tvkwoodlands/master

test code solitaire
Merge pull request #9 from csce431-e/master

updating my files