First commit
Merge branch 'master' of github.com:ray-z/Parallel-CW1