modif de quelques tpl et css
tpl contact
resol conflit
Merge branch 'master' of https://github.com/fredmontet/projet_mi