Merge pull request #12 from fgarbagnati/master

fixing weird merge issues
Merge pull request #20 from fgarbagnati/making_some_routes

Merge pull request #12 from fgarbagnati/master