TEST
Merge branch 'master' of https://github.com/bobbyloo92/CoreData

Conflicts:
	CoreDataViewController.m