add clock

add option to display a clock 
fix problem where clock and timer would alternate between displaying (solved by always setting clearInterval on both)