merge
merge with marco n eman
server now has game clock