changed
Merge branch 'master' of https://github.com/alonch/travel-agency.git

Conflicts:
	fun.php