projekt
huffman verschoben
...
huffman
...
Merge branch 'marco' into christian

Conflicts:
	huffman/Makefile
	huffman/huffman.h
	huffman/priorityqueue.h
	huffman/shaks.data
	huffman/shaks.data.result
	huffmann/Makefile
	huffmann/huffman.h
	huffmann/priorityqueue.h
	huffmann/shaks.data
	huffmann/shaks.data.result
	projekt/1huffman/Makefile
	projekt/1huffman/huffman.h
	projekt/1huffman/priorityqueue.h
	projekt/1huffman/shaks.data
	projekt/1huffman/shaks.data.result
anfang grid
ein bisschen...
Dateiausgabe