Stage
Fixed conflicts
Fixed links for home page and put new images on the home page