openshift.
openshift
package
openshift
openshift

Conflicts:
	config.json
gitignore.
openshift