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
Added Gemfile.lock to .git ignore
ADDED additional user specs
Merge pull request #9 from annieccheung/master

Temporarily ignore gemfile.lock
FIXED userspecs
Merge pull request #10 from alex-zelikow/userspecs

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

	SOLVED conflict in spec/models/user_spec.rb