Avance en el app de los sockets
Merge branch 'master' of
https://sabio@github.com/sabio/CosasDeBugDeveloper.git

Conflicts:
	android/SimpleSocketTester/res/layout/activity_client.xml
	android/SimpleSocketTester/res/values/encoding.xml
	android/SimpleSocketTester/src/com/example/simplesockettester/ClientActivity.java