Changed site
Fixed merge conflict
Reduced the images' size