Clock now works
Fixed a number in time updates
Fix merge conflicts
Merge branch 'xue0chao-master'