altered intro carousel
fixed merge conflict in Gemfile and page stylesheet