added pictures, changed layout, added css, added a new size of the picture
solving conflicts