nothing important
blah
Merge branch 'master' of github.com:jtrope89/pokedex into development
templating it up
Merge branch 'master' of github.com:jtrope89/pokedex into development
Merge branch 'master' of github.com:jtrope89/pokedex into development
getting there