Merge branch 'master' of https://github.com/AnthonyCalandra/TaskManager.git