last commit
last

commit
Merge branch 'master' of https://github.com/rmncv/coreDataHW

Conflicts:
	coreDataHW/AppDelegate.m