mas vistas
Merge branch 'master' of git@github.com:rjgp1993/MusicFeel.git

Conflicts:
	MusicFeel/gen/com/actividades/musicfeel/R.java