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

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