Merge pull request #1 from DorianVasco/html-test

test branch merging