Dummy commit

Foobar
Merge remote-tracking branch 'origin/master'

Conflicts:
	card.py
	scripts/start_client.bat
	skat_client.py