echo change
Merge https://github.com/felixhess/wptest

Conflicts:
	index.php
fixed conflict in index