terminamos
Merge branch 'master' of github.com:ab22/Appxilio

Conflicts:
	AndroidApp/Appxilio/bin/Appxilio.apk
	AndroidApp/Appxilio/bin/classes.dex
	AndroidApp/Appxilio/bin/classes/com/example/appxilio/MainActivity$10.class
	AndroidApp/Appxilio/bin/classes/com/example/appxilio/MainActivity$6.class
	AndroidApp/Appxilio/bin/classes/com/example/appxilio/MainActivity.class