Added resistor and 'fire' object to test shader.
Merge branch 'master' of https://github.com/timmyterrezza/EGDFinalProject