Version 2.1, commit 30

More assigning room and judge stuff