Added Timer class from Reading Speed project
clarified timer class
Working simple stopwatch functionality
Timer class: don't show hours unless time elapsed is greater than an hour
Resolve conflicts with remote