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
Merge branch 'master' into planoSalas

Conflicts:
	.classpath
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/ClientArte.apk
	bin/R.txt
	bin/classes.dex
	bin/dexedLibs/android-support-v4-13ae4a14a5bbdc7691d638867ab8cd71.jar
	bin/dexedLibs/android-support-v7-appcompat-a990d0b2190fd0c617506b85481b04d6.jar
	bin/dexedLibs/annotations-24cba75d16355ebfc68d9abd824cdc9f.jar
	bin/dexedLibs/appcompat_v7-ce1e9e7cd306f624d8fd77744f871494.jar
	bin/resources.ap_
	res/layout/activity_nosotros.xml
	res/values/strings.xml
	src/com/example/clientarte/AjustesFragment.java
	src/com/example/clientarte/ObraActivity.java
	src/com/example/clientarte/PreferencesFromXml.java
	src/com/example/clientarte/ProgramacionActivity.java
	src/dominio/Funcion.java
	src/dominio/Obra.java
hh