change title
add body text
Merge branch 'editing'