Merge pull request #172 from COPPER-BOBCAT/staging

Staging
Added admin add and delete functionality
Merge pull request #173 from RTakes/conflictRes

Added Admin delete and add functionality