add static pages and base bootstrap
Merge branch 'master' into make_static_pages

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