setup.sh
Merge branch 'master' of https://github.com/djungowski/phptest

Conflicts:
	README.md