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

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