added admin-warehouse-edit
Merge branch 'master' of https://github.com/kelseyleftwich/CS470-Coffee