Merge pull request #36 from pamelawang/pamtree

Updating Pamtree
Merge pull request #38 from pamelawang/pamtree

Intro image
fixed placeBoats() and overlapping problem
Merge branch 'master' into pamtree

Conflicts:
	ComputerPlayer.class
	ComputerPlayer.java