modified
Merge branch 'master' of https://github.com/crvidya/csharp-demo

Conflicts:
	shippable.yml