Update proxy.go
Merge branch 'master' of https://github.com/yosssi/ace-proxy