Edited Gemfile
Merge branch 'master' of https://github.com/mwinterfeld/Facebook_Project

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

Conflicts:
	Facebook/Gemfile
Merge branch 'master' of https://github.com/mwinterfeld/Facebook_Project
Trying to resolve conflict
Conflicts:
	Facebook/Gemfile