evn changes
layouts and pages
Merge branch 'layout'

Conflicts:
	app/helpers/application_helper.rb
	app/views/layouts/application.html.erb