un joli message
modification
modification
modification
modification
modif
Merge branch 'master' of github.com:EtiennePagis/tp-conduite-projet-2014 into EtiennePagis-master

Conflicts:
	README.md
Merge branch 'EtiennePagis-master'