Merge pull request #68 from ryanadair009/master

Infernals and Zombies
Merge remote-tracking branch 'upstream/master'