Added delete function
Fixed merge conflicts in app.js