Added a powered by image
Fixed merge conflict