added timelogging
Merge branch 'master' of github.com:anerud/AIGroup1