Updated date
Formatting tweaks
Fix merge conflict
Added new judge