change show
gMerge branch 'master' of github.com:erika-cho/rollcabbage

Conflicts:
	show.html
Merge branch 'master' of github.com:erika-cho/rollcabbage

Conflicts:
	show.html
Merge branch 'master' of github.com:erika-cho/rollcabbage