facebook login
Merge branch 'master' of https://github.com/thomasorten/Recommend
set up facebook login. Havent associated it with PF User yet.
login FUCKED
Merge branch 'master' of https://github.com/thomasorten/Recommend into custom

Conflicts:
	Recommend/Base.lproj/Main.storyboard
	Recommend/HomeViewController.m
Merge branch 'master' of https://github.com/thomasorten/Recommend into custom

Conflicts:
	Recommend/HomeViewController.m
new commit
Merge branch 'master' of https://github.com/thomasorten/Recommend into custom

Conflicts:
	Recommend/Base.lproj/Main.storyboard
login