add new route
Merge branch 'master' of https://github.com/autumnssun/pokemal

Conflicts:
	app/scripts/app.js
	app/views/explore.html