Setting up the links to pages in the layout
Merge branch 'master' into layout_links

Conflicts:
	app/helpers/application_helper.rb
	app/views/layouts/application.html.haml
Merge branch 'master' into layout_links

Conflicts:
	app/views/layouts/application.html.haml
Merge pull request #135 from theodi/layout_links

Layout links