changed test
Merge branch 'master' into set-html-test
All Words Uppercase
Merge pull request #4 from gabilen/set-html-test

Set html test
fix conflict