log update
Merge branch 'master' of https://github.com/MathiasBartl/Concurrent_Datastructures

Conflicts:
	Placeholder.hs
Public Functions