Finish layout and routes
Merge branch 'master' of https://github.com/lmbeccaria/myblog

Conflicts:
	app/views/layouts/_header.html.erb
	spec/requests/static_pages_spec.rb