merge preparation
Merge branch 'master' of https://github.com/zaikw/Group01ParallizationProj
removed temporary files