modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/assets/javascripts/application.js
	new file:   app/assets/stylesheets/profoundgrid-master/.gitignore
	new file:   app/assets/stylesheets/profoundgrid-master/README.md
	new file:   app/assets/stylesheets/profoundgrid-master/css/examples/adaptive.css
	new file:   app/assets/stylesheets/profoundgrid-master/css/examples/fixed.css
	new file:   app/assets/stylesheets/profoundgrid-master/css/examples/fluid.css
	new file:   app/assets/stylesheets/profoundgrid-master/css/examples/index.css
	new file:   app/assets/stylesheets/profoundgrid-master/css/examples/maxwidth.css
	new file:   app/assets/stylesheets/profoundgrid-master/css/examples/multiple.css
	new file:   app/assets/stylesheets/profoundgrid-master/css/examples/nested.css
	new file:   app/assets/stylesheets/profoundgrid-master/css/examples/pushpull.css
	new file:   app/assets/stylesheets/profoundgrid-master/css/examples/responsive.css
	new file:   app/assets/stylesheets/profoundgrid-master/examples/fixed.html
	new file:   app/assets/stylesheets/profoundgrid-master/examples/fixedresponsive.html
	new file:   app/assets/stylesheets/profoundgrid-master/examples/fluid.html
	new file:   app/assets/stylesheets/profoundgrid-master/examples/fluidmaxwidth.html
	new file:   app/assets/stylesheets/profoundgrid-master/examples/fluidresponsive.html
	new file:   app/assets/stylesheets/profoundgrid-master/examples/multiple.html
	new file:   app/assets/stylesheets/profoundgrid-master/examples/nested.html
	new file:   app/assets/stylesheets/profoundgrid-master/examples/pushpull.html
	new file:   app/assets/stylesheets/profoundgrid-master/img/example_grid.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/example_grid_fixed.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/example_grid_fixedresp.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/example_grid_fluid.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/example_grid_fluidresp.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/example_grid_maxw.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/example_grid_multiple.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/example_grid_nested.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/example_grid_push.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/facebook.jpg
	new file:   app/assets/stylesheets/profoundgrid-master/img/feature_customize.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/feature_responsive.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/feature_semantic.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/icons-s3a127199e7.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/icons/arrow.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/icons/button_next_bg.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/icons/button_next_bg_full.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/icons/button_next_left.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/icons/button_next_right.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/icons/download.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/icons/facebook-white.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/icons/facebook.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/icons/github.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/icons/grid.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/icons/twitter-white.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/icons/twitter.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/logo_bottom.png
	new file:   app/assets/stylesheets/profoundgrid-master/img/logo_top.png
	new file:   app/assets/stylesheets/profoundgrid-master/index.html
	new file:   app/assets/stylesheets/profoundgrid-master/js/html5shiv.js
	new file:   app/assets/stylesheets/profoundgrid-master/js/jquery-1.8.3.min.js
	new file:   app/assets/stylesheets/profoundgrid-master/js/respond.js
	new file:   app/assets/stylesheets/profoundgrid-master/js/selectivizr.js
	new file:   app/assets/stylesheets/profoundgrid-master/sass/config.rb
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/adaptive.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/fixed.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/fluid.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/index.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/maxwidth.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/modules/_downloads.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/modules/_example-container.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/modules/_footer.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/modules/_global-styles.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/modules/_header-example.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/modules/_header-index.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/modules/_nav.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/modules/_overlay.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/modules/_reference.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/multiple.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/nested.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/pushpull.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/examples/responsive.scss
	new file:   app/assets/stylesheets/profoundgrid-master/sass/grid/_grid.scss
	modified:   app/controllers/products_controller.rb
	modified:   app/controllers/recipes_controller.rb
	modified:   app/models/product.rb
	new file:   app/models/products_for_recipe.rb
	modified:   app/models/recipe.rb
	modified:   app/views/products/_form.html.erb
	new file:   app/views/products/create.html.erb
	modified:   app/views/products/index.html.erb
	modified:   app/views/products/index.json.jbuilder
	modified:   app/views/products/show.html.erb
	modified:   app/views/products/show.json.jbuilder
	new file:   app/views/recipes/.edit.html.erb.swp
	modified:   app/views/recipes/_form.html.erb
	new file:   app/views/recipes/_product_list.erb
	new file:   app/views/recipes/create.html.erb
	modified:   app/views/recipes/edit.html.erb
	modified:   app/views/recipes/index.html.erb
	modified:   app/views/recipes/index.json.jbuilder
	modified:   app/views/recipes/new.html.erb
	modified:   app/views/recipes/show.html.erb
	modified:   app/views/recipes/show.json.jbuilder
	modified:   config/routes.rb
	new file:   db/migrate/20140429215727_add_proper_pictures.rb
	new file:   db/migrate/20140515130707_create_products_for_recipe.rb
	new file:   db/migrate/20140520132334_create_products_for_recipes.rb
	new file:   db/migrate/20140525200235_add_some_fields.rb
	new file:   db/migrate/20140525203344_add_some_fields2.rb
	modified:   db/schema.rb
	new file:   public/system/products/images/000/000/007/medium/sirene.jpe
	new file:   public/system/products/images/000/000/007/original/sirene.jpe
	new file:   public/system/products/images/000/000/007/thumb/sirene.jpe
	new file:   public/system/products/images/000/000/008/medium/tocheni_kori.jpg
	new file:   public/system/products/images/000/000/008/original/tocheni_kori.jpg
	new file:   public/system/products/images/000/000/008/thumb/tocheni_kori.jpg
	new file:   public/system/products/images/000/000/009/medium/tomato.jpg
	new file:   public/system/products/images/000/000/009/original/tomato.jpg
	new file:   public/system/products/images/000/000/009/thumb/tomato.jpg
	new file:   public/system/products/images/000/000/010/medium/oil.jpe
	new file:   public/system/products/images/000/000/010/original/oil.jpe
	new file:   public/system/products/images/000/000/010/thumb/oil.jpe
	new file:   public/system/products/images/000/000/011/medium/cucumber.jpe
	new file:   public/system/products/images/000/000/011/original/cucumber.jpe
	new file:   public/system/products/images/000/000/011/thumb/cucumber.jpe
	new file:   public/system/products/images/000/000/012/medium/suhar.jpg
	new file:   public/system/products/images/000/000/012/original/suhar.jpg
	new file:   public/system/products/images/000/000/012/thumb/suhar.jpg
	new file:   public/system/recipes/images/000/000/041/medium/banitsa-bulgarian-pastry1.jpg
	new file:   public/system/recipes/images/000/000/041/original/banitsa-bulgarian-pastry1.jpg
	new file:   public/system/recipes/images/000/000/041/thumb/banitsa-bulgarian-pastry1.jpg
	new file:   public/system/recipes/images/000/000/043/medium/shopska.jpe
	new file:   public/system/recipes/images/000/000/043/original/shopska.jpe
	new file:   public/system/recipes/images/000/000/043/thumb/shopska.jpe
	new file:   public/system/recipes/images/000/000/044/medium/popara.jpg
	new file:   public/system/recipes/images/000/000/044/original/popara.jpg
	new file:   public/system/recipes/images/000/000/044/thumb/popara.jpg
	new file:   tags
	modified:   tastks.txt
	modified:   test/controllers/products_controller_test.rb
	modified:   test/controllers/recipes_controller_test.rb
	new file:   test/fixtures/products_for_recipes.yml
	new file:   test/models/products_for_recipes_test.rb

	deleted:    .tastks.txt.swp