重傳剛剛按push沒辦法選打勾的檔案
在傳一次
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/adhoctry.apk
	bin/classes.dex
	bin/classes/com/example/adhoctry/CollectionRoot.class
	bin/classes/com/example/adhoctry/FilesRoot.class
	bin/classes/com/example/adhoctry/PushMain$1.class
	bin/classes/com/example/adhoctry/PushMain.class
	bin/classes/com/example/adhoctry/PushRoot.class
	bin/classes/com/example/adhoctry/R$id.class
	bin/classes/com/example/adhoctry/R$layout.class
	bin/classes/com/example/adhoctry/R$menu.class
	bin/classes/com/example/adhoctry/R$string.class
	bin/classes/com/example/adhoctry/R$style.class
	bin/classes/com/example/adhoctry/ReceiveMain$2.class
	bin/classes/com/example/adhoctry/ReceiveMain.class
	bin/classes/com/example/adhoctry/ReceiveRoot.class
	bin/classes/com/example/adhoctry/SetRoot.class
	bin/resources.ap_
	gen/com/example/adhoctry/R.java
	src/com/example/adhoctry/PushMain.java