FINISHED TESTS!!! :D *party*
Merge branch 'master' of https://github.com/INOVA-Technology/Zombie-Smack-Down

uuuuuggggggggghhhhhhhhhhhhhhh