Added boolean "and" and "or" symbols to the "did win" function

Added && and || to the "didwin" function to satisfy project
requirements as well as had fun with an else if statement.  Also
tweaked the return from the attack function and the name for the
variable that calls the attack function.