update log
Merge branch 'master' of github.com:gijss/workinfo
update log