aproape nimic

dor un test
Merge branch 'master' of https://github.com/AlexandruNacu/Blank-Template

Conflicts:
	index.php