finished delete item function
Merge branch 'deleteitem'

Conflicts:
	js/app.js