Inserted UML diagram as a figure
Added new use cases for Reporting and Marksheets.
Added use case Edit Marksheet.
Shelve changes
Added Sections 4.4 and 5.1. Made some layout changes
Manually merged changes from my personal branch with the current version of master branch. Git could not resolve conflicts autonomously.
Manually merged changes from my personal branch with the current version of master branch. Git could not resolve conflicts autonomously.
Merge branch 'master' of https://github.com/JacoBezuidenhout/COS301-Group-8
Manually merged changes from my personal branch with the current version of master branch. Git could not resolve conflicts autonomously.
Adding ignore files
More ignores
Merge remote-tracking branch 'origin/jacques'
Person 2's files