message
Merge branch 'master' of https://github.com/jakubLikeDigitalMedia/repo_test

Conflicts:
	file4.php