mi nueva clase

h1 clase
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/index.html
Merge branch 'master' of https://github.com/addconsulta/protoss

Conflicts:
	src/index.html