user 2 actions
Merge branch 'master' of github.com:jozefchutka/test

Conflicts:
	file2.txt
	file3.txt