Worked on Diff
Merge branch 'master' of https://github.com/jerryyeezus/uZic

Conflicts:
	MyFirstApp/AndroidManifest.xml
	MyFirstApp/bin/AndroidManifest.xml
	MyFirstApp/bin/MyFirstApp.apk
	MyFirstApp/bin/classes.dex
	MyFirstApp/bin/classes/com/example/myfirstapp/DiffClient.class

MyFirstApp/bin/classes/com/example/myfirstapp/MainActivity$TCPSendMessag
e.class
	MyFirstApp/bin/classes/com/example/myfirstapp/MainActivity.class
	MyFirstApp/bin/classes/com/example/myfirstapp/Message.class
	MyFirstApp/bin/resources.ap_
	MyFirstApp/src/com/example/myfirstapp/DiffClient.java
	MyFirstApp/src/com/example/myfirstapp/MainActivity.java
	MyFirstApp/src/com/example/myfirstapp/Message.java