Merge pull request #312 from BU-CS673/Canfield

Canfield -> Canfield-Staging
Merge pull request #314 from BU-CS673/Canfield

Canfield -> Canfield-Staging
BulletExplosionSprite.draw now tested in unit test
Merge branch 'Canfield-Staging' into Canfield