comments added
resolving

Conflicts:
	bin/TestAllIn.apk
	bin/classes.dex
	bin/classes/com/example/testallin/TestMain.class
	src/com/example/testallin/TestMain.java