second commit
Merge https://github.com/xzha/testFlappyBird