broken client controller test- need to fix stubbing
tried things
passing tests
passing client controller test
removed whitespace
Merge branch 'client_controller_tests'
fixed merge conflicts in specrunner
Merge pull request #417 from chelseakomlo/master

Added ClientController and UserSettingsController Tests