adding fallback background color
adding background color and resolving merge conflicts
Merge pull request #8 from Fit-Genie/stopwatch

Stopwatch