Phase 2 real fix (divide by 0)
Merge branch 'master' of https://github.com/tomrunia/negotiation-project