modified:   MAD_Exercise/bin/MAD_Exercise.apk
	modified:   MAD_Exercise/bin/classes.dex
	modified:   MAD_Exercise/bin/classes/com/example/mad_exercise/ClientActivity$1.class
	modified:   MAD_Exercise/bin/classes/com/example/mad_exercise/ClientActivity$2.class
	modified:   MAD_Exercise/bin/classes/com/example/mad_exercise/ClientActivity$3.class
	modified:   MAD_Exercise/bin/classes/com/example/mad_exercise/ClientActivity$4.class
	modified:   MAD_Exercise/bin/classes/com/example/mad_exercise/ClientActivity.class
	modified:   MAD_Exercise/bin/resources.ap_
	modified:   MAD_Exercise/src/com/example/mad_exercise/Class diagram.ucls
	modified:   MAD_Exercise/src/com/example/mad_exercise/ClientActivity.java
Merge branch 'master' of https://github.com/mindisx/MAD-Course-App