server.py: Prettify the queue page
main.py: Detect merge conflicts when testing a single pull request
README.md: Add "additional features" section