Merge branch 'master' of github.com:jjlee5266/pokemon_app into images
Merge pull request #6 from jjlee5266/images

Merge branch 'master' of github.com:jjlee5266/pokemon_app into images