test
Merge branch 'master' of https://github.com/mcartaud/ProjetVacances

Conflicts:
	enregistrement.sql

Signed-off-by: Clemzd <clemzd@gmail.com>