Renamed package to match assignment deliverable
Merge pull request #3 from AlexKolpa/Alex

Renamed package to match assignment deliverable
Merge branch 'master' into AcceptanceStrategy

Conflicts:
	src/negotiator/group1/Group1_AS.java

@tomvand, please check if your work was preserved correctly. If that's the case, you can merge this.