définition Chorader

Signed-off-by: JeanneR <jeanne.rataj@hotmail.fr>
définition chorader
merge
Merge branch 'master' of https://github.com/esadhar/onsegit2014

Conflicts:
	gounache
Merge branch 'master' of https://github.com/esadhar/onsegit2014
Merge branch 'master' of https://github.com/esadhar/onsegit2014
Merge branch 'master' of https://github.com/esadhar/onsegit2014
Merge branch 'master' of https://github.com/esadhar/onsegit2014