add custom font, remove carousel from index in place for static display
fix merge conflict in gemfile