from downloads
Merge branch 'master' of https://github.com/Gunnstein/gitTest

Conflicts:
	file1.tex