modified by Virgile
Merge branch 'virgile' into CA

Conflicts:
	README.txt
add gitignore
Merge branch 'master' into CA