Merge pull request #13 from alex-zelikow/master

FIXED rspec model code and pseudocode
ADDED upcase_name before_save method to user model
CHANGED upcase_name from before_save to after_initialize
UPDATED user initialization with empty first_name last_name in registration#new and UPDATED upcase_name to before_validation
Merge branch 'master' of github.com:josephktcheung/grasshopper
PULLED from Joseph master
ADDED skill and proficiency models.
CHANGED skills_user model name to proficiency.
CHECK for nil before capitalize.
CHANGED reference to skills_user to proficiency in skill and user model.
CHANGED upcase_name to before_save and UPDATED find_by_code to update_all
CREATED reset_password invalid if blank test
ADDED skills and profiencies migrations.
UPDATED downcase_name in skill.rb
Merge branch 'annieccheung-skill_model'
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
FIXED user.rb name regexes and REFACTORED user.rb 'before_xxx' callbacks
Merge branch 'new'

Conflicts:
	app/models/user.rb