seed
Merge branch 'master' of https://github.com/netguru-training/fridgematch

Conflicts:
	app/controllers/application_controller.rb