Merge branch 'Release3.0' of D:\CS361\GetHub\ChronoTimer1009 with conflicts.
Merge remote-tracking branch 'origin/Release3.0' into Release3.0
Merge remote-tracking branch 'origin/Release3.0' into Release3.0
Add class