added polygon clock drawing code
fixed merge, kinda
merge conflict resolve
fixed the width and height stuff
merge again