Cosym/Pokemon-Showdown-Client — pull request #1 by piiiikachuuu (2013-09-07 17:08:27+00:00)
Title: clean up some merge errors

and update my color :>