Boni edit daily scrum + burn down
Merge remote-tracking branch 'origin/master'