Updates
Merge branch 'master' of https://github.com/ealtenho/happyblue
Updating the journal edit