fireflies back in
Merge branch 'master' of github.com:ethanmn/CPE476Final