added user_spec
Merge branch 'master' into user_model

Conflicts:
	app/models/user.rb
Merge branch 'master' into user_model
Added user specs
Moved product_spec to /spec/models
Merge pull request #9 from Elffers/user_model

User model