Un joli message
Merge branch 'master' of github.com:YoanDony/tp-conduite-projet-2014 into YoanDony-master

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