twitter bootstrap and less rails
Merge branch 'bootstrap' of github.com:AlexZerr/bonediva into bootstrap

Conflicts:
	Gemfile.lock