Merge branch 'master' of https://github.com/contestant/ipynb_openshift

Conflicts:
	.openshift/action_hooks/start
aaaaaaaaaa