add twitter_bootstrap_rails gem
merge