added bootstrap sass gem
updated gemfile to resolve conflict
Remove one bootstrap-sass gem from gemfile