prueba
Creo  nueva rama para backend
Commmit rama Agustina
Base usuario
Merge branch 'backend01_Agustina'

Conflicts:
	bin/ClientArte.apk
	bin/R.txt
	bin/classes.dex
	bin/resources.ap_
	project.properties
	src/com/example/clientarte/Adaptador.java
	src/com/example/clientarte/MainActivity.java
	src/com/example/clientarte/NavigationAdapter.java
	src/com/example/clientarte/ObraActivity.java
	src/com/example/clientarte/PruebaasientosActivity.java
	src/com/example/clientarte/SplashScreenActivity.java
Merge con branch backend01 (Base de datos)
Merge branch 'master' of https://github.com/yaelhh/MobileArte.git

Conflicts:
	bin/R.txt
Nueva rama servicios