Add editing guidelines
Add entry on adding files
Merge branch 'master' into gh-pages