Merge branch 'master' of https://github.com/Jzhuzhu/SuperDex

Conflicts:
	SuperDex/pokemon/views.py