added bootstrap
fixed Gemfile after merge