Finilised
Merge branch 'master' of https://github.com/cos301-group3/mini_project