Removed the old way of doing it. New way is busted though
Player format, Pokemon bugfix for toJSON
Merge branch 'master' into dev-image
Fixed pokemon image bug. Moved pokemon images to 'pokemon' folder
Moved ImageFinder to service package