finished up with the users controller specs
Merge branch 'testing_users_controller'