Add background image and adjusted elements
Fix merge conflicts

Conflicts:
	app/views/home/index.html.erb