fix conflicts
add proper delete functionality, sorry rick, thanks Kevin, I hate Caleb
Merge pull request #52 from KimpossibleG/delete-functionality

Delete functionality