finished adding core data
finished adding core data
Merge remote-tracking branch 'origin/master'
merged