Squash Messy Commits

Combine several WIP commits into one.

A intermediate Git challenge worth 10 points. Solve it hands-on in a real Git environment in your browser - no local setup, no fake shells.