色々更新
Merge branch 'master' of https://github.com/pine613/spdream

Conflicts:
	library/db/seeds.rb