FactoryGirl導入＆ログインモデル追加
Merge branch 'FactoryGirl'

Conflicts:
	spec/models/user_spec.rb