worked on storyboard, added core data
Merge remote-tracking branch 'origin/master'
worked on storyboard, added core data