this works
Merge remote-tracking branch 'origin/meredith'

Conflicts:
	FreshSpheroApp.xcodeproj/project.pbxproj