changing headers
Merge branch 'master' of github.com:jackzerby/workshop

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