New file hello.html
Merge branch 'featureB' into develop