Partially rewrote user_spec.rb
ADDED skill_spec and skills_users_spec.
ADDED users_controller_spec.rb
Merge branch 'skills_spec' of github.com:annieccheung/grasshopper into annieccheung-skills_spec

Conflicts:
	RESOLVED Gemfile.lock
Merge branch 'master' of github.com:josephktcheung/grasshopper
Merge pull request #8 from Simon245/users_controller_test

ADDED users_controller_spec.rb
Added new fields to database and ran migration
REMOVED god damn libv8
ADDED additional user specs
Merge pull request #9 from annieccheung/master

Temporarily ignore gemfile.lock
ADDED users_controller and scope api to routes
FIXED userspecs
Merge pull request #10 from alex-zelikow/userspecs

ADDED new user specs and CREATED new user fields in the database
ADDED gems and UPDATED user model and user_spec
Merge remote-tracking branch 'origin/master' into implement_user_MVC

	SOLVED conflict in spec/models/user_spec.rb
Merge pull request #11 from Simon245/users_controller_test

ADDED users_controller and scope api to routes
ADDED set_save after_initialize method to USER model
FIXED rspec model pseudocode
FIXED rspec user model
Merge pull request #13 from alex-zelikow/master

FIXED rspec model code and pseudocode