added the most awesome pokehmon
Merge branch 'master' of https://github.com/iterate/sommergit