macadondra définition
Merge branch 'HEAD' of https://github.com/esadhar/onsegit2014.git
Merge branch 'HEAD' of https://github.com/esadhar/onsegit2014.git

Conflicts:
	macadondra.md
Merge branch 'HEAD' of https://github.com/esadhar/onsegit2014.git
Merge branch 'HEAD' of https://github.com/esadhar/onsegit2014.git
Merge branch 'HEAD' of https://github.com/esadhar/onsegit2014.git