Specflow
Merge branch 'master' of https://github.com/froko/Contoso

Conflicts:
	scripts/Contoso.ps1