test
Merge branch 'master' of https://github.com/MeryllEssig/Archiver

Conflicts:
	compresseur/#huf.c#

ee