big update
merge conflicts
Merge branch 'master' of github.com:jjlee5266/pokemon_app

Conflicts:
	app/views/layouts/application.html.erb