Gemfileの追記と古いMigrateファイルの消去
Merge branch 'master' of https://github.com/pine613/spdream
Merge branch 'master' of https://github.com/pine613/spdream
ユーザ側のControllerとViewを作成、CSSを適用
Merge branch 'master' of https://github.com/pine613/spdream

Conflicts:
	study/Watanabe/db/schema.rb