Cleaned up code of phase 2
Merge branch 'master' of https://github.com/tomrunia/negotiation-project