EncryptDecrypt
Merge branch 'develop' of https://github.com/mathieulachance/LOG320_Huffman into develop

Conflicts:
	src/main/EncryptDecrypt.java