update
Merge branch 'master' of https://github.com/youthcode/Persistence

Conflicts:
	Persistence.xcodeproj/project.pbxproj

Persistence.xcodeproj/project.xcworkspace/xcshareddata/Persistence.xcche
ckout
	Persistence/BIDFourLines.h
	Persistence/BIDFourLines.m
	Persistence/BIDViewController.m