project file
Merge remote-tracking branch 'origin/master' into tom

Conflicts:
	Rendezvous.xcodeproj/project.pbxproj
no photo is now handled correctly
nophoto commit
last photo reference commit to fix multiple places of the same name
login view controller redirect and ratings
timeout change
Added Ratings UI
Star PNG
Added Google Login capability
G+ automatic sign in now functional
Now auto-presents RendezvousVC when already signed in with G+
Fetches userEmail and logs to console. Also streamlines Google SignIn and SignOut flows.
Added FB logout ability to SettingsVC. Fixed issue when switching between Google and FB logins.
basic commit
Merge branch 'jeremy' of github.com:jeremytripp/rendezvous into jeremy

Conflicts:
	Rendezvous.xcodeproj/project.pbxproj
Fixes all issues relating to multiple login flows by adding global NSString variable "switches".
Merge branch 'jeremy' into tom

Conflicts:
	Rendezvous.xcodeproj/project.pbxproj
Merge branch 'tom' into jeremy

Conflicts:
	Rendezvous.xcodeproj/project.pbxproj
new changes