complete testimonial sidebar and missing banner
syncing files with rivera
fixed merge conflicts