intercode 04
merge conflix
Merge branch 'Xieyan-master'
solve conflict
Merge pull request #8 from stanleytangerror/master

intercode 05