progress
Merge branch 'master' of https://github.com/Gaboasca/somefacultyproject

Conflicts:
	header.php
	hotels.php
	index.php