Edited the marketeer on some points.

Added the basic for the GUIBehaviour
Merge branch 'master' of https://github.com/WouterVeen/JadeMarktplaats

Conflicts:
	src/marketeer/Marketeer.java