Fixes for header.
Merge branch 'master' of github.com:alienfungi/my_page

Conflicts:
	app/views/layouts/_header.html.erb