background
Merge branch 'homePage'

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