Working on phase2 debugging
Merge branch 'master' of github.com:tomrunia/negotiation-project

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