teste de inclusão de classe
Merge origin/master

Conflicts:
	PhpProject1/index.php
	PhpProject1/nbproject/project.properties