Slide Slot Matter Kaufen + Einfügen Grafiken
Merge branch 'master' of https://github.com/Xychun/Scrounge

Conflicts:
	client/client.js