got the delete, and edit working
Merge remote-tracking branch 'origin/master'