Added the about us template and updated the header block tag to head
Fix merge conflicts + add about template

Conflicts:
	app/views/pages/index.liquid.haml