Creacion de clases para videos
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/strings.xml
	src/activities/Resultado.java