ugh i have to commit apparently
Merge branch 'master' of https://github.com/modit/chronicle
more fixes