more merging weirdness
Merge branch 'master' of https://github.com/wdeanmedical/ehr