PS7 finished
Merge branch 'master' of github.com:kaffeesiader/parallel_algorithms