上にポイントの数字を追加
Merge remote-tracking branch 'origin/master'

Conflicts:
	BarrelBall/src/com/appreators/game/barrelball/BarrelBallActivity.java