Merge branch 'master' of github.com:p3dda/trainingslog