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 'tom' into jeremy

Conflicts:
	Rendezvous.xcodeproj/project.pbxproj
new changes
Merge branch 'jeremy' of https://github.com/jeremytripp/rendezvous into jeremy
Settings commit?