I added some stuff to index and style
I made stuff gaudier
resolved conflicts with upstream