Commit
Merge branch 'master' of https://github.com/fedetrim/baufest.git

Conflicts:
	testphp.php