Merge pull request #6 from EthanBlackburn/master

merge
Merge pull request #7 from EthanBlackburn/master

monster attack
Merge pull request #6 from pmarti28/master

update