bla
modif 12 21
Merge branch 'master' of https://github.com/bachy/esadhar-onsegit-2014

Conflicts:
	02.md
	12.md
	21.md
Merge branch 'master' of https://github.com/bachy/esadhar-onsegit-2014

Conflicts:
	21.md
Merge branch 'master' of https://github.com/bachy/esadhar-onsegit-2014