Fix
Pulled updated tests and fixed to make them work
Merge branch 'COS243'

Conflicts:
	spec/models/user_spec.rb
	spec/requests/users_pages_spec.rb