update
Merge https://github.com/rdscorreia/goexamples

Conflicts:
	json/json.go
	json/yaml.go
	json/yamlexample.go