changes
guidelines
Merge branch 'davis-content' into gh-pages