all working
all done
Merge pull request #9 from COMP2404/submit

Submit