conflict fixed
Merge branch 'master' of https://github.com/ionutdny9/WebProject

Conflicts:
	tw2014/rezervari.php