updating upstream changes; using tw=78
Merge branch 'master' of https://github.com/sebgod/skat