got things working in one pass, but it is no good
Merge branch 'master' into one-pass-per-model
 remove bounding boxes
More tree variance.
Merge branch 'master' of github.com:Ethanmn/CPE476Final
Merge branch 'master' into one-pass-per-model

Conflicts:
	src/graphics/draw_shaders.cpp
	src/graphics/shaders.cpp
	src/graphics/shaders.h
 compiling
Bush variance.
useTextureShader is true
 turned off the timer
Rock variance.
shaders cpp was using final shader for texture. now only rendering texture or deferred/final
Merge branch 'master' into one-pass-per-model
Butterfly variance.
Merge branch 'master' of github.com:Ethanmn/CPE476Final
More flower variance. Better daisy collision.
added new ground planes
Merge branch 'master' of https://github.com/Ethanmn/CPE476Final

Conflicts:
	textures/grass.bmp
added firefly model and texture
working correctly