install bootstrap
modify copyright
Merge branch 'bootstrap'

Conflicts:
	Gemfile
	Gemfile.lock