regot
Merge remote-tracking branch 'origin/master'

Conflicts:
	net.xml
Merge branch 'master' of https://github.com/OstapUljana/TravelAgency

Conflicts:
	net.xml