Group7 AS als basis MAC
Merge branch 'master' of https://github.com/tomrunia/negotiation-project