Rewrite of Phase 3
Merge branch 'master' of https://github.com/tomrunia/negotiation-project