Merge pull request #8 from foobarbecue/master

Also catch ValueError, for example if user doesn't enter anything.
Move print statements out of resolve_fight so that AIs can call it without a bajillion lines of junk on human's screen.