Merge branch 'master' of https://github.com/CSc436/gymjournals
Merge branch 'master' of https://github.com/CSc436/gymjournals
Fixed merge conflicts
Fix conflict