updates
Merge branch 'master' of github.com:Robert-Wett/journal