comment out stuff
merge conflict
rubcop order and client auth class
change set to parse to appease rubocop
rubocop shipper class
rubocop shipper controller spec
r
rubocop spec files
Merge branch 'refactor' of github.com:Elffers/SlothShip into refactor
Merge pull request #15 from Elffers/refactor

Refactor