Minor changes to notes, commit to merge
Merge branch 'master' of https://github.com/bjonor/journal
Fixed new note and edit note