Atualizacao.
Merge branch 'master' of https://github.com/hick209/CoDec-Hypermedia
Arrumei o merge
Conflicts:
	Huffman.cpp
Nada mudou
Merge branch 'master' of https://github.com/hick209/CoDec-Hypermedia

Conflicts:
	Huffman.cpp