Fixed index.html indentation - ALL SECTIONS; closed some erroneously open tags
Fixed merge conflicts, having not pulled prior to previous indentation changes