first commit branch tibi
Merge branch 'tibi'
merge configuration from 2 branches
second commit - common file
modif in index.php file