Merge branch 'master' into meera_branch
Working on ComputerPlayer's shoot()

… and related methods to shoot()
Merge pull request #43 from pamelawang/meera_branch

Meera branch
Manual merge of commit #42
Merge branch 'master' into pamtree

Conflicts:
	.DS_Store
Merge branch 'meera_branch'
Merge branch 'master' into meera_branch
Merge branch 'pamtree' into meera_branch
Merged conflicts
Merge branch 'meera_branch' of https://github.com/pamelawang/Battleship into meera_branch