testimonial
Merge branch 'master' of https://github.com/eefsparreboom/singleparadise

Conflicts:
	index.php