Changed test.md
Updated propeller
Update creds for openshift
Merge branch 'master' of github.com:croteb/test-cd

Conflicts:
	test.md