Trying to commit a conflict
Merge branch 'master' of github.com:fgalli-micros/GitHubTest

Conflicts:
	myNewFileHtml.html