yenatch/pokecrystal — pull request #3 by kanzure (2013-08-30 19:21:11+00:00)
Title: Proposed merge of kanzure/master into yenatch/master

Better that this is done here and now than later.