Se va encaminando el Despertame A Tiempo
Problema para pushear
Merge branch 'master' of https://github.com/Grupo6PIS/BeatIt-Android

Conflicts:
	BeatIt/.gitignore
	BeatIt/gen/com/facebook/android/R.java
	BeatIt/gen/com/g6pis/beatit/R.java
	BeatIt/project.properties