要旨・全文追加
Merge branch 'master' of https://github.com/pine613/spdream

Conflicts:
	library/db/schema.rb
Merge branch 'master' of https://github.com/pine613/spdream
Merge branch 'master' of https://github.com/pine613/spdream