Delete .DS_Store
Fix merge
Merge branch 'master' of https://github.com/zackliston/ZLTaskManager