modified:   MAD_Exercise/bin/MAD_Exercise.apk
	modified:   MAD_Exercise/bin/classes.dex
	deleted:    MAD_Exercise/bin/classes/com/example/mad_exercise/Client$ClientThread.class
	modified:   MAD_Exercise/bin/classes/com/example/mad_exercise/Client.class
	modified:   MAD_Exercise/bin/classes/com/example/mad_exercise/R$id.class
	modified:   MAD_Exercise/bin/classes/com/example/mad_exercise/R$layout.class
	modified:   MAD_Exercise/bin/classes/com/example/mad_exercise/R$menu.class
	modified:   MAD_Exercise/bin/classes/com/example/mad_exercise/R$string.class
	modified:   MAD_Exercise/bin/classes/com/example/mad_exercise/R$style.class
	modified:   MAD_Exercise/bin/resources.ap_
	modified:   MAD_Exercise/gen/com/example/mad_exercise/R.java
	modified:   MAD_Exercise/res/layout/activity_main.xml
Working socket listener and client. However, both parts for now only work when invoked seperetley and they are not binede together.
	modified:   MAD_Exercise/bin/MAD_Exercise.apk
	modified:   MAD_Exercise/bin/classes.dex
	modified:   MAD_Exercise/bin/classes/com/example/mad_exercise/Client.class
	new file:   MAD_Exercise/bin/classes/com/example/mad_exercise/ClientTask.class
	new file:   MAD_Exercise/bin/classes/com/example/mad_exercise/ServerTask.class
	modified:   MAD_Exercise/src/com/example/mad_exercise/Client.java
Merge branch 'master' of https://github.com/mindisx/MAD-Course-App

Conflicts:
	MAD_Exercise/bin/MAD_Exercise.apk
	MAD_Exercise/bin/classes.dex
	MAD_Exercise/bin/resources.ap_