Merge branch 'master' of https://github.com/Telecomurder/le-miel-de-l-empire

Conflicts:
	Makefile
Merge branch 'master' of https://github.com/Telecomurder/le-miel-de-l-empire

Conflicts:
	Makefile