activeadmin setup
Merge branch 'master' of github.com:netguru-training/fridgematch

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

Conflicts:
	db/schema.rb