ke yi guole
Merge branch 'master' of https://github.com/zlei/flappy-pipe

Conflicts:
	bin/Flappy.apk
	bin/classes.dex