Creating template
Merge branch 'master' of github.com:scudelletti/hello-openshift

Conflicts:
	README.md