oops, forgot the gitignore!
Merge branch 'master' of https://github.com/silverweed/pokepon