added twitter-bootstrap-rails and dependencies

Conflicts:
	Gemfile.lock