addtime completed
Merge branch 'Girmiam' of github.com:Gi11i4m/ChronoMaticProject into Girmiam