erge products
Merge branch 'master' of https://github.com/paulsutcliffe/lainonrails4

* 'master' of https://github.com/paulsutcliffe/lainonrails4:
  Article
  Product
  Scaffold template patch. Product
  Rails layout bootstrap3. Ability. Role. User & Role seeds. User: Basic factory.

Conflicts:
	app/assets/stylesheets/products.css.scss
	app/views/products/_form.html.haml
	app/views/products/edit.html.haml
	app/views/products/index.html.haml
	app/views/products/index.json.jbuilder
	app/views/products/new.html.haml
	app/views/products/show.html.haml
	app/views/products/show.json.jbuilder
	db/migrate/20140705022036_create_products.rb
	spec/controllers/products_controller_spec.rb
	spec/factories/products.rb
merge app.css
Merge branch 'master' of https://github.com/paulsutcliffe/lainonrails4

* 'master' of https://github.com/paulsutcliffe/lainonrails4:
  Testimony. Simple form without message in line.
Merge branch 'master' of https://github.com/paulsutcliffe/lainonrails4

* 'master' of https://github.com/paulsutcliffe/lainonrails4:
  Article: Uploader, controller, image in views.
style app e index
Merge branch 'master' of https://github.com/paulsutcliffe/lainonrails4

* 'master' of https://github.com/paulsutcliffe/lainonrails4:
  Product: Uploader, controller, image in views. Doc

Conflicts:
	app/controllers/products_controller.rb
	app/models/product.rb