local commit
Merge branch 'master' of https://github.com/thomasorten/Recommend
facebook login
Merge branch 'master' of https://github.com/thomasorten/Recommend

Conflicts:
	Recommend.xcodeproj/project.pbxproj

changes