a
Merge branch 'master' of
https://github.com/kefran/course_cyclotouriste.git

Conflicts:
	appli/global.asa