upload
Merge branch 'master' of https://github.com/latermoon/GoLearning

Conflicts:
	tour/fmt.go