outline with writing assignments
Merge branch 'master' into Aaron