i se  komituje index - MG
i se  komituje index - MG
Merge origin/master

Conflicts:
	PhpProject1/index.php
	PhpProject1/nbproject/project.properties
Merge origin/master

Conflicts:
	PhpProject1/index.php