Revert "Revert "Merge branch 'master' of https://github.com/lizzb/kaffeeklatsch""

This reverts commit 140e58fc3a2d7bd86fc862f395af48437a1b028b.
Revert "ugh my git syncing overwrote stuff from you guys that i wanted…trying to revert…"

This reverts commit 2e76a45b88ecad185f9f50f4a754a69cdffe3259.