Committing
Merge branch 'master' of https://github.com/kernprojekt/ThreadProject

Conflicts:
	Non-Blocking-Synchronisation/src/de/htwk/thread/LockFreeList.java
Merge branch 'master' of https://github.com/kernprojekt/ThreadProject