fixed merge conflict with user-controller branch
pantries are fully CRUDed
Merge branch 'pantry-controller' of https://github.com/simensta/refrigeratory into user-controller
done for the day. almost done with crud