Transfer Files.
No source conflict.

Merge branch 'master' of https://github.com/DarronXu/cardboard

Conflicts:
	bin/Cardboard.apk
	bin/classes.dex
	bin/classes/PureTcpIp/DarronCommit.class
	bin/classes/PureTcpIp/DarronNetServer$ServerSpeaker.class
	bin/classes/PureTcpIp/DarronNetServer.class
	bin/classes/PureTcpIp/DarronNetServer1$ServerSpeaker.class
	bin/classes/PureTcpIp/DarronNetServer1.class
	bin/classes/PureTcpIp/NetA.class
	bin/classes/PureTcpIp/NetB$ThreadTwo.class
	bin/classes/PureTcpIp/NetB.class
	bin/classes/PureTcpIp/NetB1$ThreadTwo.class
	bin/classes/PureTcpIp/NetB1.class
	bin/classes/PureTcpIp/NetB2$1.class
	bin/classes/PureTcpIp/NetB2.class
	bin/classes/PureTcpIp/NetServer$ServerSpeaker.class
	bin/classes/PureTcpIp/NetServer.class
	bin/classes/PureTcpIp/PiClientA.class
	bin/classes/PureTcpIp/PiClientB.class
	bin/classes/PureTcpIp/PiServerA$ServerSpeaker.class
	bin/classes/PureTcpIp/PiServerA.class
	bin/classes/PureTcpIp/PiServerB$ServerSpeaker.class
	bin/classes/PureTcpIp/PiServerB.class
	bin/classes/PureTcpIp/Test.class
	bin/dexedLibs/android-support-v4-3ab330d88025332f0338ecea2359f1b4.jar
	bin/dexedLibs/cardboard-1d6bd5a0c72b014aa9789bb44410bd8e.jar
	bin/dexedLibs/modelloader-73f900824493e0697045ad35da0bdc0c.jar
	bin/resources.ap_
	server/.ngrok-tcp
	server/.ngrok-tcp.025
	server/.ngrok-tcp.026