Fixed bug where two people could fight and both die
Merge branch 'master' of github.com:wnewbury/151FinalProject