setup travis openshift
Merge branch 'master' of https://github.com/xyzxyz442/helloworld.git

Conflicts:
	.travis.yml