Merge branch 'master' of https://github.com/infoscout/shoparoo-website

Conflicts:
testimonials.html