comit
Merge branch 'master' of https://github.com/Gabbe1993/Network_Programming_With_Java_Homework2

Conflicts:
	src/server/MarketServer.java
cleanup and minor changes
Merge branch 'master' of https://github.com/Gabbe1993/Network_Programming_With_Java_Homework2

Conflicts:
	src/marketplace/MarketImpl.java
no message
Merge branch 'master' of https://github.com/Gabbe1993/Network_Programming_With_Java_Homework2

Conflicts:
	src/marketplace/MarketImpl.java