stage
s
Merge branch 'master' of https://github.com/ozi3/GoldenTest

Conflicts:
	stageconfig