First commit
Merge branch 'master' of https://github.com/kesdeband/COMP6905_Project