added a delete function for journals
Merge branch 'develop' of https://github.com/nahakiole/fredyframework into develop
Reformatted code again optimised for 80 columns