trying
Merge branch 'master' of https://github.com/satolyte/veritours

Conflicts:
	.DS_Store