chap1 finished.
task1 finished.
task 1: all done, including dealing with different heights of two scenes
Merge remote-tracking branch 'upstream/master'
task1 finished
Merge branch 'master' of https://github.com/gloryming/First-Game
Merge branch 'master' of https://github.com/gloryming/First-Game
Merge branch 'master' of https://github.com/gloryming/First-Game
Merge branch 'master' of https://github.com/gloryming/First-Game
Merge branch 'master' of https://github.com/gloryming/First-Game
no message
Merge pull request #9 from kagada/master

zhengweilin
Merge pull request #8 from Iakgun/master

task 1: all done, including dealing with different heights of two scenes
Merge pull request #7 from Zeoh/master

chap1 finished.
Merge pull request #10 from magic8sky/master

finished chapter2