adsabs/adsabs — pull request #4 by aholachek (2013-09-26 13:08:21+00:00)
Title: Hi Jay

I'm getting a message in the sidebar that looks like this

"We can’t automatically merge these branches
Don't worry, you can still submit the pull request."

But I pulled from upstream right before I merged my wordcloud branch into the master branch, so I'm not sure what's happening.