generated user controller
about to pull
abot to pull
pushing so nigel can work on pantry view
fixed merge conflicts
controllers and views in progress, prepping to merge with user branch