Fix merge errors.
Merge branch 'master' of https://github.com/panpawn/Pokemon-Showdown