merging docs from master Merge branch 'master' of https://github.com/steve-federowicz/om
merging docs from master
Merge branch 'master' of https://github.com/steve-federowicz/om

steve-federowicz/om,steve-federowicz/om,steve-federowicz/om