update 1

hopefully merging
2
New css, index, etc