Extracted links into sidebar partial, changed some indentations.
Merge branch 'master' of github.com:catherine-jones/my-blog into refactoring

Conflicts:
	app/controllers/posts_controller.rb
	app/views/layouts/_header.html.erb
	app/views/pages/about.html.erb
	app/views/posts/index.html.erb
	app/views/posts/show.html.erb
Merge pull request #3 from catherine-jones/refactoring

Extracted links into sidebar partial, changed some indentations.