cleanup
Merge branch 'dev' of github.com:nerdfiles/web-journal into dev