fix visualization
Merge branch 'bootstrap'

Conflicts:
	app/views/layouts/application.html.erb