jobtype finished
Merge branch 'master' of https://github.com/YangHeDM/cs572_d3