test
怒提bin
Merge branch 'master' of https://github.com/River418/ScoreLive.git

Conflicts:
	bin/ScoreLive.apk
	bin/classes.dex
	bin/classes/com/scorelive/R$color.class
	bin/classes/com/scorelive/R$dimen.class
	bin/classes/com/scorelive/R$drawable.class
	bin/classes/com/scorelive/R$id.class
	bin/classes/com/scorelive/R$layout.class
	bin/classes/com/scorelive/R$string.class
	bin/classes/com/scorelive/R$style.class
	bin/classes/com/scorelive/R$styleable.class
	bin/classes/com/scorelive/R$xml.class
	bin/classes/com/scorelive/ScorePageActivity$2.class
	bin/classes/com/scorelive/ScorePageActivity.class
	bin/resources.ap_
	gen/com/scorelive/R.java
Merge branch 'master' of https://github.com/River418/ScoreLive.git