format
add logging
Merge branch 'master' of github.com:bborbe/go

Conflicts:
	benchmark/benchmark.go