Finished installing bootstrap
Updated gemfile conflict