Afternoon teabreak Day 1.
Merge remote branch 'origin/my-workshop' into my-workshop
At the end of the first day.