made it so you can't send pokemon out in battle who are fainted
Merge remote-tracking branch 'remotes/origin/master'
removed compiling errors with fossilcleaningmachines
Merge remote-tracking branch 'origin/master'