fixed .rvmrc file. deleted jquery-rails from Gemfile because jquery-rails comes with rails now.
Merge branch 'master' into develop to get .rvmrc and Gemfile changes
updated gemfile.lock
Merge pull request #4 from WomenWhoCode/master

get Gemfile.lock changes across to develop
created User table and migration
Merge branch 'develop' of github.com:WomenWhoCode/HelloRubyTuesdays into develop
added password/encryption to user model
add debug info pages
added some tests, skeleton user page
re added jquery rails
Merge branch 'hotfix/add-jquery'
Merge branch 'hotfix/add-jquery' into develop
corrected jquery version
added password/encryption to user model
add debug info pages
added some tests, skeleton user page
corrected jquery version
Merge branch 'feature/user-signup-georgia' of github.com:WomenWhoCode/HelloRubyTuesdays into feature/user-signup-georgia

Conflicts:
	Gemfile.lock
Merge pull request #5 from WomenWhoCode/feature/user-signup-georgia

Feature/user signup georgia
added form & enabled login