Huffman Compressor
Merge branch 'master' of https://github.com/JPMMaia/CAL-2

Conflicts:
	src/CompressionManager.cpp
	src/CompressionManager.h