Working on taskManager (Scrum)
Merge remote-tracking branch 'origin/master'