Zarel/Pokemon-Showdown — pull request #549 by nmodi (2014-01-09 05:44:39+00:00)
Title: Natural Gift update for XY

Sorry if this is too many commits, I'm new to using Git but I am definitely getting better at it! That said, there was a missing comma in the first commit which I fixed and my local server runs correctly after fixing the comma.