devise user added
omniauth added
Merge branch 'master' of https://github.com/netguru-training/fridgematch

Conflicts:
	app/models/user.rb
	db/schema.rb
Merge branch 'master' of https://github.com/netguru-training/fridgematch

Conflicts:
	config/routes.rb
	db/schema.rb