Merge branch 'master' of https://github.com/fort-pinnsvin/travel

Conflicts:
	main.go
	models/collections.go
	models/models.go