Initial CoreData implementation
Merge branch 'master' of https://github.com/rickdenhaan/kokkie
Fixed viewWillAppear conflict