Fixed double rest bug in Battle.cpp. I believe that this was a merge error. :/