looking for fixes
fixed merge conflicts
Merge branch 'dev' of https://github.com/therealbenjamin/Marvel-Zombies into dev