fix enhanced testing
Merge branch 'filling-in-layout'

Conflicts:
	Gemfile
	app/helpers/application_helper.rb
	app/views/layouts/application.html.erb
	spec/spec_helper.rb
Finish layout and routes
Finish layout and routes