catalogue
Merge branch 'HEAD' of https://github.com/kathleenlogmao/Lasvea.git

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/layouts/application.html.erb
	app/views/pages/index.html.erb
carousel fix
Merge branch 'HEAD' of https://github.com/kathleenlogmao/Lasvea.git

Conflicts:
	app/assets/stylesheets/style.css.scss
	app/views/pages/index.html.erb
Fixed layout