Agrego un HTML y modifico el .txt
Merge branch 'master' of github.com:Chardot/test

Conflicts:
	readme.txt