re-wrote package
updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	system/chronserver.go
	system/client.go