test route
change routes
merge conflict
comments
add specs
updated routes
fix merge conflict
Merge pull request #10 from Elffers/carrier

Carrier