Transfer files.
Merge branch 'master' into TryShading

Conflicts:
	bin/jarlist.cache
	gen/com/IYYX/cardboard/R.java
Tranfer Files.
Tranfer files.
Transfer files
Tranfer files.
Transfer Files.
Shading is Successful.
Merge branch 'TryShading'

Conflicts:
	.classpath
	assets/Andorid G.obj
	assets/TextureInfo/Andorid G.obj-info
	assets/Textures/android.obj/green.png
	assets/Textures/android.obj/pink.png
	assets/Textures/android.obj/ribbon.png
	assets/Textures/android.obj/white.png
	bin/Cardboard.apk
	bin/classes.dex
	bin/classes/PureTcpIp/DarronNetServer1$ServerSpeaker.class
	bin/classes/PureTcpIp/DarronNetServer1.class
	bin/dexedLibs/android-support-v4-3ab330d88025332f0338ecea2359f1b4.jar
	bin/dexedLibs/cardboard-1d6bd5a0c72b014aa9789bb44410bd8e.jar
	bin/dexedLibs/modelloader-73f900824493e0697045ad35da0bdc0c.jar
	bin/resources.ap_
	gen/com/IYYX/cardboard/R.java
	src/com/IYYX/cardboard/StartupActivity.java
Merge branch 'master' of https://github.com/DarronXu/cardboard.git

Conflicts:
	assets/Andorid G.obj
	assets/R2D2.obj
	assets/TextureInfo/Andorid G.obj-info
	assets/TextureInfo/R2D2.obj-info
	assets/Textures/r2d2.png
Merged /assets