Judge

Merging upstream so I can start working on the judge GUI.