just push
Merge branch 'openshift'
Merge branch 'master' of ssh://skga-radim.rhcloud.com/~/git/skga

Conflicts:
	README
 just deploy
just deploy