Merge pull request #33 from pamelawang/pamtree

Merge pull request #32 from pamelawang/master
Merge branch 'pamtree'
Merge branch 'master' of https://github.com/pamelawang/Battleship
Updated Boat
made changes
Merge pull request #34 from pamelawang/Meera

Player and ComputerPlayer
Checklist
Re-updated Player, fixed removeBoat() (Player)

-updated all uses of Boat() (without name as a parameter)
-fixed removeBoat() by making reset() in Boat a method in Player
(resetBoat())
Manual merge of pull request #35
Updated Checklist
Merge branch 'master' into pamtree

Conflicts:
	.DS_Store