はい
Merge branch 'master' of https://github.com/pine613/spdream

Conflicts:
	study/tanaka/app/views/tops/index.html.erb