//timer
Merge branch 'master' of github.com:Noxwille/timeLogSys
timer has been modified