Only log files changed
Merge branch 'master' of https://github.com/tomrunia/negotiation-project

Conflicts:
	NegotiationAgent/src/negotiator/group7/phases/Phase2.java