add here in home.html.erb
add here in home.html.erb
Merge remote-tracking branch 'remotes/origin/default!' into addbootstrapgems

Conflicts:
	app/views/default/home.html.erb
Merge remote-tracking branch 'remotes/origin/default!' into addbootstrapgems

Conflicts:
	app/views/default/home.html.erb
Merge remote-tracking branch 'remotes/origin/default!' into addbootstrapgems

Conflicts:
	app/views/default/home.html.erb
k