Fixed conclusion and stuff
Merge branch 'master' of github.com:tomrunia/negotiation-project