Backup commit CP_PS6
Merge branch 'master' of github.com:kaffeesiader/concurrent_programming