Fix conflict
Merge branch 'master' of github.com:luizirber/cse891-parallel-computing
Final project abstract skeleton