PULLED from Joseph master
CHECK for nil before capitalize.
CREATED reset_password invalid if blank test
CREATED test cases for user_spec.rb
Merge branch 'rspec_user_spec' of github.com:Simon245/grasshopper into Simon245-rspec_user_spec

  RESOLVED conflict in db/schema.rb
UPDATED schema