full time request
Merge branch 'develop' of https://github.com/jgnt32/RGUPS_Time into develop