Fixed up merge-trouble where index.html was lost.