Merge branch 'master' of https://github.com/rodsordi/newGitTest

Conflicts:
Test.html
Merge