Huffman Work

Signed-off-by: Johnstein <joao.neto.feup@gmail.com>
Merge branch 'master' of https://github.com/JPMMaia/CAL-2

Conflicts:
	src/Huffman.cpp
	src/Huffman.h