first commit
Merge branch 'master' of https://github.com/G12/MAD9135-ASSIGN2