I love you
Merge branch 'master' of https://github.com/phacks/marketplace

Conflicts:
	src/logic/ClientInterface.java
	src/logic/MyServer.java
	src/logic/ServerInterface.java