fixed edit and delete events
merged with git
working on new stuff
merging
Merge branch 'master' of https://github.com/supasani/Project
worked on javascript events sorting, filtering etc.
fixed merge conflict