Removed the bootstrap code
Merge branch 'master' of github.com:101companies/101rails

Conflicts:
	app/assets/javascripts/bootstrap.js.coffee