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

Conflicts:
	src/marketplace/MarketImpl.java
Merge branch 'master' of https://github.com/Gabbe1993/Network_Programming_With_Java_Homework2
Changes to Market and added UserException