Phase 2 DO NOT CONCEDE!!!!
Merge branch 'master' of https://github.com/tomrunia/negotiation-project