added delete to user
fixed conflicts
Merge pull request #25 from natewinn/david

added delete to user