Merge branch 'Controllers' of https://github.com/carper33/el_passatge
Merge branch 'master' of https://github.com/carper33/el_passatge
fix routes files