Partially rewrote user_spec.rb
Added new fields to database and ran migration
Merge branch 'master' of https://github.com/josephktcheung/grasshopper

Conflicts:
	Gemfile.lock
REMOVED god damn libv8
Added Gemfile.lock to .git ignore
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
ADDED tardycat and FIXED a lot of code and UPDATED/CHANGED the database (migrations no longer match schema.rb due to some problems and resets)
FIXED registration flow but users still do not save to the database
ADDED full registration, login, and logout functionality