pokemon can die and battles can be lost
Merge remote-tracking branch 'origin/master'