carouselv1 push
Merge remote-tracking branch 'upstream/homepagecreation' into adding-devise

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	config/routes.rb
Fixing CSS