test commit
Merge branch 'master' of github.com:stevenolen/ohmage-openshift-quickstart