food/drink
Merge branch 'feature/food' into develop

Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb
	db/seeds.rb