exercices chap3 solved
Merge branch 'static-pages-exercices' into filling-in-layout

Conflicts:
	test/functional/static_pages_controller_test.rb
layout and routes finished