double checking to see if i fixed weird merge issues
Merge pull request #22 from fgarbagnati/making_some_routes

double checking to see if i fixed weird merge issues