finished placing ship methods and testing on player class
fixing merge
fixed merge problemgit status