bootstrap
Merge branch 'filling-in-layout'

Conflicts:
	app/views/layouts/_footer.html.erb
	app/views/layouts/_header.html.erb
	app/views/static_pages/home.html.erb
arrange before committing