Changes from the meeting, including tree and mushroom details.
Merge branch 'master' of https://github.com/JBillingsley/eecs-390-rts.git

Conflicts:
	Assets/TitleScreen/TitleTest.unity