Merge branch 'master' of https://github.com/LittleBaiBai/FingerSinger

试试而已，不知道哪里有问题
Conflicts:
	bin/FingerSinger.apk
	bin/classes.dex
	bin/jarlist.cache
	src/com/game/fingersinger/DrawLines.java
再试一次merge