Commit PHPStorm

Conflicts:
	teste.php
TEste