My first pull request

I do not know what I am doing.  A little message to the right says that these branches can't be automatically merged, but I don't see any conflicts, which is uninformative.  I'm just going to hit this big green "Send pull request" button and see what happens.