worked on first viewcontroller hooked up objects and core data persistence
Merge pull request #1 from Donysa/master

Edit Task & Category Task View Controller
mini changes
Donysa updated storyboard
synced with donysas latest version
Merge pull request #2 from jnbaker/master

Jasmine-pull request try # 1
Donysa made minor changes to Category View Controller
Merge branch 'master' of https://github.com/acontero/TaskListApp
stupid dsstore
fixed merge  conflict
Merge pull request #3 from jnbaker/master

fixed merge conflict
changes from yesterday
Merge branch 'master' of https://github.com/acontero/TaskListApp
Merge pull request #4 from jnbaker/master

latest changes to Lists for master
fixed merge conflicts for Jasmine and Donysa's projects
adding changes
Merge branch 'master' of https://github.com/acontero/TaskListApp
Merge branch 'master' of https://github.com/acontero/TaskListApp
updates
Donysa updated Tasks View Controller and ToDoList View Controller