I don't know which commit I'm on!
Merge pull request #2 from lee-leonardo/master

Commit 2: Sorry! (I was promised conflicts, but GitHub says this can be auto merged)