Merge pull request #4 from jnbaker/master

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