edit
test
Merge branch 'master' of github.com:pppbk/WordWorld

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/com/wordworld/R$drawable.class
	bin/classes/com/wordworld/R$id.class
	bin/classes/com/wordworld/R$layout.class
	bin/classes/com/wordworld/R$menu.class
	bin/classes/com/wordworld/R$string.class
	bin/classes/com/wordworld/R$style.class
	gen/com/wordworld/R.java
	res/layout/index.xml
delete empty folder