change utf-8 encoding
add new encoding utf-8
Merge branch 'master' of https://github.com/izerocrazy/GoServer

Conflicts:
	src/HttpG/get.go
	src/HttpG/result.txt
Merge branch 'local'

Conflicts:
	src/HttpG/get.go
	src/HttpG/result.txt
change encoding