Update the Gemfile according to screencast
Change to Ruby 1.9-style hash syntax
Finish layout and routes
Delete default Rails index
Merge branch 'filling-in-layout'