updated routes
fixed merge conflicts
finished users controller spec
updated routes again
Merge pull request #77 from bobolinks-2014/controller-spec

Controller spec