Revert "Basic html page"

This reverts commit bf18246aca9ba2793b5d6ddb1f1294e1773e11fb.
Revert "Revert "Basic html page""

This reverts commit 5810b8dca5204f28d502a0ad2ac7d95b91f3fccf.
Merge remote-tracking branch 'origin/master'