New poof
Merge branch 'master' of http://github.com/FrPSServ/Pokemon-Showdown