merging mostly index.html additions to master