new .gitignore adding /app/tmp/
arranging safely contain() to tourist edit
Merge commit 'f1aaaabe62767087a1a60072d20f5f2ee90946bb' into tourist-guide

Conflicts:
	.gitignore
badges documentation