I'm fetching but I don't know why.
Merge branch 'master' of https://github.com/tennisbear/grouptopics.org
I luv git, I really, really do.
Fixed merge conflict