Changed phase1 duration to 0.2
Return 1 for f if outside of bounds
Merge branch 'master' of github.com:tomrunia/negotiation-project

Conflicts:
	NegotiationAgent/src/negotiator/group7/Group7_BS.java
OK IK MAAK WEL FOUTEN OK!
Merge branch 'master' of github.com:tomrunia/negotiation-project