Working on items
Merge branch 'master' of https://github.com/novoalg/recipe_delight

Conflicts:
	recipe_delight/Gemfile.lock
	recipe_delight/app/models/customer.rb
	recipe_delight/db/schema.rb

:q
Working on customer recipes, fixed filters for pages