Merge pull request #3 from jnbaker/master

fixed merge conflict
changes from yesterday
Merge branch 'master' of https://github.com/acontero/TaskListApp