Make colours have the same name between Disk and Player

Colours have the same name: "Black" and "White". Previously, the colours
were either: "B" and "W" or "Black" and "White". This made it difficult
to use the compare method.
Code improvements to rules

This is to allow for rules implementation to demonstrate the use of
design patterns.