added the ruby gemset and the ruby version
Merge branch 'djmrr-mike/rubygemsetandversion'
added ruby gemset and version files
Changed Users/New page
Merge pull request #12 from gaudiomatthew/master

Profile Work
Merge pull request #13 from gaudiomatthew/derek/team_A

Merge pull request #12 from gaudiomatthew/master
Added files for profile contoller and views
Merge pull request #14 from gaudiomatthew/master

Actually committed the files this time...
Merge branch 'master' into derek/team_A
Profile Changes

:wq
q
Merge pull request #15 from gaudiomatthew/derek/team_A

Derek/team a Profile Work... Basic profile work
Merge branch 'master' of github.com:gaudiomatthew/Tinderapp
Changed App Name to ClassApp
Merge branch 'master' into usermvc

Conflicts:
	app/views/users/new.html.erb
	config/routes.rb