changed users controller back
Merge pull request #39 from armenvartan/armen-changes

changed users controller back
working on getting fixing question bug
Merge branch 'master' of github.com:red-spotted-newts-2014/food-overflow