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

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