basic commit
Merge branch 'jeremy' of github.com:jeremytripp/rendezvous into jeremy

Conflicts:
	Rendezvous.xcodeproj/project.pbxproj