make parallel
Merge branch 'master' of github.com:daniel19/CSC-4100