Some edits
Merge branch 'master' of https://github.com/tomrunia/negotiation-project

Conflicts:
	Report/conclusion.tex
Merge branch 'master' of https://github.com/tomrunia/negotiation-project