Merge sam's index.html with ruby index.html