installed twitter bootstrap
installed twitter bootstrap gems
gemfile conflict fix
fixed conflict