.DS_Store
Merge branch 'master' into pamtree

Conflicts:
	ComputerPlayer.class
	ComputerPlayer.java
Merge pull request #39 from pamelawang/pamtree

Pamtree