Fixing rebase. (Git n00b here.)
Actually fix of previous screw-up.
Add stopwatches (timers that count up) to the app.
Fix issue with changes in the wrong branch.

Apologies to Future Matthew, I'm still learning how to use Git
properly.