Merge pull request #7 from stanleytangerror/master

intercode finished
lab04
merge temp
conflicts fixed
finish
merge conflix
Merge branch 'Xieyan-master'
solve conflict