fixed merge
Merge pull request #104 from feministy/routes_fix

fixed merge