fixes routes
resolved the stupidest merge conflict
Merge pull request #12 from Elffers/security

Security
Merge pull request #13 from Elffers/refactor

Refactor
checking diffs on github
resolves merge conflicts
Merge pull request #14 from Elffers/bugfix

Bugfix
comments
merge conflict
rubocop shipper controller
merge conflict
rubcop order and client auth class
change set to parse to appease rubocop
rubocop shipper class