added leaf stuffs
added leaf.dae
Updated a lot of particle stuff
Fixed trees from making leaves when spawned
Fixed, kinda
fixed. I HOPE.
Shadows now have alpha check
shadow and texture match in alpha amount
one of the older ground planes
added test_plane.obj
Merge branch 'master' of https://github.com/Ethanmn/CPE476Final
Deer sleeeeepy
Added leaf.tga
Merge branch 'master' into leaf

Conflicts:
	shaders/Texture.frag
	src/Tree.cpp
	src/Tree.h
	src/TreeGenerator.cpp
	src/TreeGenerator.h
added rocks and pinecone models and textures
Merge branch 'master' of https://github.com/Ethanmn/CPE476Final
leaves now dissapear after a set amount of time
Merge branch 'master' of http://github.com/ethanmn/CPE476Final
merge master
testplane