Merge remote-tracking branch 'origin/master'

Conflicts:
	data/src/hello/main1.go

data/src/hello/main.go

@@ -2,11 +2,8 @@ package main
 
 import (
 	"fmt"
-	"time"
 )
 
 func main() {
-		fmt.Println("Hello, 世界")
+	fmt.Println("Hello, 世界")
-
-		time.Sleep(time.Second)
 }

data/src/time/time.go

@@ -0,0 +1,9 @@
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	fmt.Println("Hello, 世界")
+}