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

Conflicts:
	res/layout/setting.xml