Un joli message
Merge pull request #29 from HectorBasset/master

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

Conflicts:
	README.md
Merge branch 'master' of github.com:Chouwibaka/tp-conduite-projet-2014 into Chouwibaka-master

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