changement
Merge branch 'master' of github.com:Madahin/miniProjet

Conflicts:
	vue.php