Minor changes
Merge branch 'master' of https://github.com/rjflp/ett-tourism

Conflicts:
	main.tex