forçando conflito
Merge branch 'master' of https://github.com/ton21/newGitTest

Conflicts:
	index.html