Modifs functions.php
Merge functions.php
Merge branch 'master' of https://github.com/jboissonneault/github-test