Data from socket is accessible in Android
Fixed merge conflicts
Merge branch 'master' of https://github.com/jdori/Wingman

Conflicts:
	app/src/main/java/com/wingman/ypc/MainActivity.java
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/jdori/Wingman

Conflicts:
	app/src/main/java/com/wingman/ypc/MainActivity.java
Merge branch 'master' of https://github.com/jdori/Wingman

Conflicts:
	app/src/main/java/com/wingman/ypc/MainActivity.java