changed to controllers
Merge branch 'master' of https://github.com/PatrickLouys/no-framework-tutorial