Creating template
fixed conflicts
added openshift setup