Started writing section about OUR strategy
Fixed conflicts in report
Merge branch 'master' of https://github.com/tomrunia/negotiation-project