update
Merge branch 'master' of https://github.com/Argann/shiny-octo-bear
update
Merge branch 'master' of https://github.com/Argann/shiny-octo-bear

Conflicts:
	v0.0.1/src/vue/Formulaire.java