homepage
fixed merge conflicts in new user, application.js, gemfiles and schema
changes in stylesheets, carousel, views and deleted application.css
homepage changes and fixed merge conflicts