prueeee
Merge branch 'master' of https://github.com/yaelhh/arte.git

Conflicts:
	CloudBackendAndroidClient/src/pruebita.java