created migration
Merge branch 'master' into devise_emails
fixed schema
fixed merge conflict
Merge branch 'master' of github.com:TIY-iron-shop/iron-shop
Merge branch 'master' of github.com:TIY-iron-shop/iron-shop
basic item CRUD
Merge pull request #11 from TIY-iron-shop/item_crud

Item crud
add to cart button
Merge branch 'master' into cart

Conflicts:
	app/views/layouts/application.html.haml
	config/routes.rb