working out or syntax
resoving conflicts
Merge branch 'master' of https://github.com/tduck/mission-email-journal