added gettimefromserver
added done
Merge branch 'sammy'