Hello World Script
Goodbye added
Merge branch 'Feature1'

Conflicts:
	test.ps1