Adjusted Clock and mate

Adjusted the definition of the Clock class, moved all vars to private.
Made mate(Clock, Clock) a friend of Clock, also made it a function.
Need to strike mate.h.