first commit
Merge branch 'master' of https://github.com/JaquierM/BA1S2