Stupid .DS_Store file that I can't find
Merge branch 'master' into pamtree

Conflicts:
	.DS_Store
Merge pull request #36 from pamelawang/pamtree

Updating Pamtree