formatting
Merge branch 'master' of github.com:jtrope89/pokedex into development
fixing merge conflicts