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
part 2 finished.
Revert "part 2 finished."

This reverts commit a8c101a1b2cc8d0a97bc1bea54a88098656bf72a.
part 2 finished.
Merge pull request #11 from Zeoh/master

part 2 finished.