Merge pull request #336 from BU-CS673/Brandon

Damageable Refactor
Merge pull request #346 from BU-CS673/production

Merge pull request #336 from BU-CS673/Brandon