Adding a tree generator.
Merge branch 'master' of https://github.com/ethanmn/CPE476Final

Conflicts:
	src/GroundPlane.cpp
	src/GroundPlane.h
	src/game.cpp
	src/game.h
Merging tree gen code with new game.cpp shader stuffs.
OMG. I'm just trying to push my code, but everyone is pushing, and I just keep having to merge. GIT! LET ME COMMIT!
Merge branch 'master' of https://github.com/ethanmn/CPE476Final
I KEEP TRYING TO ADD MY CODE AND EVERYONE KEEPS PUSHING AND I HAVE MERGED SOOOO MANY TIMES NOW. And now my code is broken and it's not in my code.