added delete
Merge branch 'master' of https://github.com/mallochine/jarvis2