Sorted out strap and titles
Merge branch 'master' of github.com:harry-m/nhgd13

Conflicts:
	app/views/layouts/application.html.haml