editing for lectures
Merge branch 'editing'