Cambios para hacer commit:
	modificado: index.html
 Cambios no preparados para el commit:
	modificado: .gitignore
Merge branch 'master' of https://github.com/kriminal666/PruebaKriminal

Conflicts:
	index.html
 If this is not correct, please remove the file
 and try again.