Primer commit despues del error
Conflict solve
UpdateProfile, add column in DB
alsdjfñka
Merge remote-tracking branch 'origin/dsadevelopers'

Conflicts:
	AnakinKarts-server/AnakinKarts-api/src/main/java/edu/upc/eetac/dsa/dsaqp1314g3/AnakinKarts/api/EventoResource.java
	AnakinKarts-server/AnakinKarts-api/src/main/java/edu/upc/eetac/dsa/dsaqp1314g3/AnakinKarts/api/UserResource.java
conflictos solucionados
DeleteUser and getEventPub
Merged
commit subida inicio android, manifest, html horarios,
a