added users controller spec
fixing merge conflicts
created users controller spec
Merge pull request #71 from bobolinks-2014/controller-spec

Controller spec