Merge pull request #5 from hunter32292/master

added lots of image stuff commiting and pulling from origin
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
Added mobile app
Working on customer recipes, fixed filters for pages
Merge pull request #6 from zahradtj/master

Added mobile app
Fixed bugs with filters.... again
Merge branch 'master' of https://github.com/novoalg/recipe_delight

:q
holy crap so many filter bugs, fixed another one
andriod stuff