demo edits
Merge branch 'in-class-edits'
possible solutions