modify
Merge branch 'master' of github.com:momoplan/Game2
modify
Merge branch 'master' of github.com:momoplan/Game2

Conflicts:
	res/drawable/corners_bg_one.xml
moidfy
modifjy
Merge branch 'master' of github.com:momoplan/Game2

Conflicts:
	src/com/chatgame/constants/Constants.java