Creating template
Merge remote-tracking branch 'openshiftfoxy/master'
i screwed up part 2