Core Data
Merge branch 'master' of https://github.com/mll/codersmill

Conflicts:
	.DS_Store
	Magdalena/.DS_Store
	glaz/.DS_Store
	glaz/project-1/project-1.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
	testy/.DS_Store
Merge branch 'master' of https://github.com/mll/codersmill