Issue #216

edit, delete and list all done
Issue #216

merge conflict fix