Merge pull request #30 from sandstroh/sandrosbranch

a lot of changes
merged changes for index.html