new functions
Merge branch 'master' of https://github.com/WouterVeen/JadeMarktplaats

Conflicts:
	src/Marketeer/Marketeer.java