Local changes prior to pull.
Merge branch 'master' of github.com:randalburns/ocpcatmaid
Merge branch 'master' of github.com:randalburns/ocpcatmaid
Resolved but broken.  user 0c174e9683782d2452c67e9d9ff1cadc0344ed29
Merge branch 'master' of github.com:randalburns/ocpcatmaid