Resolved merge conflicts with master

.gitignore

BUILD

Makefile

README.md

build.json

build.yaml

examples/csharp/helloworld/.nuget/packages.config

examples/csharp/helloworld/Greeter/Greeter.csproj

examples/csharp/helloworld/Greeter/packages.config

...ples/csharp/helloworld/GreeterClient/GreeterClient.csproj

examples/csharp/helloworld/GreeterClient/packages.config

...ples/csharp/helloworld/GreeterServer/GreeterServer.csproj

examples/csharp/helloworld/GreeterServer/packages.config

examples/csharp/helloworld/README.md

examples/csharp/route_guide/.nuget/packages.config

examples/csharp/route_guide/README.md

examples/csharp/route_guide/RouteGuide/RouteGuide.csproj

examples/csharp/route_guide/RouteGuide/packages.config

examples/csharp/route_guide/RouteGuideClient/App.config

...harp/route_guide/RouteGuideClient/RouteGuideClient.csproj