reword comment
added butteflies to bushes. could be better (fly out of the the center of the bush), but I don't really feel like it right now
Merge branch 'master' of http://github.com/ethanmn/CPE476Final
Added butterflies when colliding with bushes.
Moving the butterflies above the bushes.
Merging master with Ethan's code.
Still merging.
Adding in butterfly probability.
Adding a cap on number of butterfly systems and butterflies don;t show up at night.
redid sphere.obj
Merge branch 'master' of https://github.com/Ethanmn/CPE476Final
Merge branch 'master' into lightingAdjustments
fireflies working, now adjusting godrays