étienne
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe1

Conflicts:
	Test.txt
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe1

Conflicts:
	Test.txt
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe1
étienne
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe1
etienne
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe1
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe1
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe1
Merge branch 'master' of https://github.com/Academia2013Cohort3/Equipe1