Made the rspec tests for the user model and controller.
Merge branch 'Develop'

Conflicts:
	spec/models/user_spec.rb