update
Merge branch 'master' of https://github.com/DenniJensen/BachelorThesis

Conflicts:
	src/main/java/optimized/Huffman.java