added testimonials and split gallery into bridal and jewellery
fixed conflicts