edits
merge with ajc edits
Merge branch 'master' of https://github.com/acbecker/W13report