some new
Merge branch 'master' of https://github.com/jmdkina/jkgo

Conflicts:
	jkgo/goproj/bin/protoc-gen-go.exe