fixed timer, star and diamond moves in same function, score counter
cleaned up some old code
post merge final product?