test
Merge branch 'master' of https://github.com/KeitoSugiyama/sample_app

Conflicts:
	app/views/layouts/_footer.html.erb
	app/views/layouts/_header.html.erb