final update
Merge branch 'master' of https://github.com/mayor1/COMP258-Project