Creating template
added openshift dir
Merge branch 'master' of ssh://rssreader-billblake.rhcloud.com/~/git/rssreader

Conflicts:
	pom.xml