Merge branch 'master' of https://github.com/szpali76/TransTrekking

Conflicts:
	.gitattributes
	.gitignore