Change Clock

Removed coolclock and added a basic clock.
Updated Clock

Added 12-hour format and UTC.
Fix HTML

Fixed the table row and data tags being reversed.
Resolve merge conflicts
Resolve merge conflicts