Creating template
Updating README.md with latest instructions.
Merge remote-tracking branch 'openshift/master'

Conflicts:
	README.md