Add a new Comment on master
Add a potential merge conflic
Merge branch 'master' of https://github.com/Weier/espagne-vacances.git

Conflicts:
	README.md
Merge branch 'master' of https://github.com/Weier/espagne-vacances

Conflicts:
	README.md
merged
Add info for ftp in new stream
Test a change in sideBranche
add a second Test