Daily scrum log
Merge conflict solved