generated user controller
about to pull
abot to pull
pantry routes complete, moving to views
getting ready for user controller branch merge
pushing so nigel can work on pantry view
fixed merge conflicts
merging so nigel can use user auth for pantry views
controllers and views in progress, prepping to merge with user branch
fixed merged conflicts after merge
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
fixed a user auth issue. nigel is about to implement two devise features
saving so nigel can work on his laptop
just an update for everyone else
fixed merge conflicts
Merge pull request #14 from simensta/finishing-crud

saving so nigel can work from his laptop