bug
Merge branch 'master' of github.com:marcmaxson/djotjog