added user_spec
Merge branch 'master' into user_model

Conflicts:
	app/models/user.rb
Merge branch 'master' into user_model
created order controller, orderproduct specs
create order controllers, orderproduct specs
Merge pull request #6 from Elffers/order_rspecs

Order rspecs
Merge pull request #7 from Elffers/w-html

W html
order controller
Merge branch 'master' of https://github.com/Elffers/Hippo
Merge pull request #8 from Elffers/order_rspecs

Order rspecs
trying some cart stuff
fixed some product methods, added product form
Added user specs
Moved product_spec to /spec/models
Merge pull request #10 from Elffers/order_rspecs

Order rspecs
Merge pull request #9 from Elffers/user_model

User model
Product edit views and required update functionality