First commit
Merge branch 'HEAD' of https://github.com/alonch/travel-agency.git

Conflicts:
	dependencies.php
	index.php
	view/html/index.html