Modificari la test.php line 1
Merge branch 'master' of https://github.com/toleabivol/elara

Conflicts:
	test.php