Config & text
Merge branch 'master' of https://github.com/julienhay/php-mvc