Allow entering a different server IP on start for grading
Fixed merge conflicts