Merge branch 'master' of https://github.com/AdamDeHovitz/pd9_TheAthlings_AdamD-ThomasD-DennisN

Conflicts:
	TreeObject.class
Conflict?