testing whether anybody can commit, this is to prepare a coding jam
Merge branch 'master' of https://github.com/johnsyweb/openmrs-cpm