1、添加背景音乐
1、添加背景音乐
1、游戏界面丰富
Merge branch 'guosong'

Conflicts:
	oldFight/bin/classes.dex
	oldFight/bin/oldFight.apk
	oldFight/bin/resources.ap_
	oldFight/src/com/dongdong/oldfight/MenuActivity.java
	oldFight/src/com/dongdong/oldfight/uitl/Const.java
	oldFight/src/com/dongdong/oldfight/view/EndView.java
	oldFight/src/com/dongdong/oldfight/view/GameSurfaceView.java