pjcali/Pokedex — pull request #1 by quwert95 (2012-04-22 01:42:01+00:00)
Title: Pull in my Edits.

Confirm my edits - 2-step merge is the best merge.