part 1 of lab 19, layouts
fixed merge confilict

Merge branch 'master' of https://github.com/cszh222/MVC-prototyping-in-Ruby-on-Rails
Conflicts:
	app/controllers/items_controller.rb