add time to normal
Merge branch 'master' of https://github.com/axelhildingson/groupName1