5-2まで。layout変更
add bootstrap. (見た目が変だけど)
partial layout
sass
Merge branch 'master' of github.com:satoshiyoshinaga/rails_sample_app into filling-in-layout

Conflicts:
	Gemfile
	Gemfile.lock