$
Merge branch 'master' of github.com:Nitix/web-avancee

Conflicts:
	Model/Vue.php
Merge branch 'master' of github.com:Nitix/web-avancee
css
Merge branch 'master' of github.com:Nitix/web-avancee