Merge branch 'master' of https://github.com/sdjidjev/randompokemon
catch em all
everything
angular witchcraft
conflict resolution