..
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
.
Merge branch 'master' into thomas
Stuff
facebook login
Merge branch 'master' of https://github.com/thomasorten/Recommend
set up facebook login. Havent associated it with PF User yet.
Fixed loading of new and popular recommendations.
.
login FUCKED
Merge branch 'master' of https://github.com/thomasorten/Recommend into custom

Conflicts:
	Recommend/Base.lproj/Main.storyboard
	Recommend/HomeViewController.m
Refactored model, added user location to UI.
Merge branch 'master' of https://github.com/thomasorten/Recommend into custom

Conflicts:
	Recommend/HomeViewController.m
Added error messages for user location and no recommendations in your area.
new commit