merge conflict

Godeps/Godeps.json

Godeps/_workspace/src/github.com/rs/cors/.travis.yml

Godeps/_workspace/src/github.com/rs/cors/LICENSE

Godeps/_workspace/src/github.com/rs/cors/README.md

Godeps/_workspace/src/github.com/rs/cors/bench_test.go

Godeps/_workspace/src/github.com/rs/cors/cors.go

Godeps/_workspace/src/github.com/rs/cors/cors_test.go

...workspace/src/github.com/rs/cors/examples/alice/server.go

...rkspace/src/github.com/rs/cors/examples/default/server.go

..._workspace/src/github.com/rs/cors/examples/goji/server.go

...rkspace/src/github.com/rs/cors/examples/martini/server.go

...rkspace/src/github.com/rs/cors/examples/negroni/server.go

...rkspace/src/github.com/rs/cors/examples/nethttp/server.go

...rkspace/src/github.com/rs/cors/examples/openbar/server.go

Godeps/_workspace/src/github.com/rs/cors/utils.go

Godeps/_workspace/src/github.com/rs/cors/utils_test.go

cmd/geth/admin.go

cmd/geth/main.go

cmd/mist/main.go

cmd/utils/flags.go