sad pokemons and other proposals
fix merge conflicts
Merge branch 'coleww-patch-1'