Updated Gemfile
Merge branch 'master' of https://github.com/jongillies/bootstrap

Conflicts:
	Gemfile.lock