commit 3 in master
Merge branch 'master' of https://github.com/Pihtt/gittests

Conflicts:
	file1.txt