Creating template
Merge remote-tracking branch 'openshift/master'

Merged the cadrige data and the blog data

Conflicts:
	README.md