Added comment to Gemfile
guta1844 editted Gemfile
Merge branch 'master' of https://github.com/mwinterfeld/Facebook_Project into dev-mwinterfeld
restored Gemfile
testing
Merge branch 'master', remote-tracking branch 'origin'
Merge branch 'dev-mwinterfeld', remote-tracking branch 'origin'
Merge branch 'master' of https://github.com/mwinterfeld/Facebook_Project

Conflicts:
	Facebook/Gemfile
Edited Gemfile again
Merge branch 'master' of https://github.com/mwinterfeld/Facebook_Project
Merging

Conflicts:
	Facebook/Gemfile
Created rdoc stuff
Merge branch 'master' of https://github.com/mwinterfeld/Facebook_Project
Trying to resolve conflict
Conflicts:
	Facebook/Gemfile
added models
Added username and password fields to user