g
Merge branch 'master' of https://github.com/iammain/NegoAgent

Conflicts:
	Report/final.log
	Report/final.pdf
	Report/final.synctex.gz
	negotiator/boaframework/acceptanceconditions/other/AStrategy.java